devs/stabber
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Removed pthreads dependency, tidied server code

Browse Source
This commit is contained in:
James Booth
2015-05-12 00:50:19 +01:00
parent 39fe147a8a
commit 0fb5ced9ef
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -14,9 +14,6 @@ AC_PROG_CC
PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [], PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [],
[AC_MSG_ERROR([glib 2.26 or higher is required])]) [AC_MSG_ERROR([glib 2.26 or higher is required])])
AC_CHECK_LIB([pthread], [main], [],
[AC_MSG_ERROR([pthread is required])])
AM_CFLAGS="-Wall -Wno-deprecated-declarations" AM_CFLAGS="-Wall -Wno-deprecated-declarations"
AM_CFLAGS="$AM_CFLAGS -Wunused -Werror" AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"
AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS"

10
src/server/server.c
View File

@@ -163,8 +163,6 @@ int main(int argc , char *argv[])
port = 5222; port = 5222;
} }
int listen_socket, client_socket;
int c, ret;
struct sockaddr_in server_addr, client_addr; struct sockaddr_in server_addr, client_addr;
if (argc == 2) { if (argc == 2) {
@@ -175,7 +173,7 @@ int main(int argc , char *argv[])
// create socket // create socket
errno = 0; errno = 0;
listen_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); // ipv4, tcp, ip int listen_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); // ipv4, tcp, ip
if (listen_socket == -1) { if (listen_socket == -1) {
perror("Could not create socket"); perror("Could not create socket");
return 0; return 0;
@@ -187,7 +185,7 @@ int main(int argc , char *argv[])
// bind socket to port // bind socket to port
errno = 0; errno = 0;
ret = bind(listen_socket, (struct sockaddr *)&server_addr, sizeof(server_addr)); int ret = bind(listen_socket, (struct sockaddr *)&server_addr, sizeof(server_addr));
if (ret == -1) { if (ret == -1) {
perror("Bind failed"); perror("Bind failed");
return 0; return 0;
@@ -203,9 +201,9 @@ int main(int argc , char *argv[])
puts("Waiting for incoming connections..."); puts("Waiting for incoming connections...");
// connection accept // connection accept
c = sizeof(struct sockaddr_in); int c = sizeof(struct sockaddr_in);
errno = 0; errno = 0;
client_socket = accept(listen_socket, (struct sockaddr *)&client_addr, (socklen_t*)&c); int client_socket = accept(listen_socket, (struct sockaddr *)&client_addr, (socklen_t*)&c);
if (client_socket == -1) { if (client_socket == -1) {
perror("Accept failed"); perror("Accept failed");
return 0; return 0;