Introducing common code

Makefile

@@ -43,8 +43,10 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/appclient.c \
 		$(PACKAGE)-$(VERSION)/src/appinterface.c \
 		$(PACKAGE)-$(VERSION)/src/appserver.c \
+		$(PACKAGE)-$(VERSION)/src/common.c \
 		$(PACKAGE)-$(VERSION)/src/Makefile \
 		$(PACKAGE)-$(VERSION)/src/appinterface.h \
+		$(PACKAGE)-$(VERSION)/src/common.h \
 		$(PACKAGE)-$(VERSION)/src/project.conf \
 		$(PACKAGE)-$(VERSION)/tools/appbroker.c \
 		$(PACKAGE)-$(VERSION)/tools/appclient.c \

src/Makefile

@@ -20,7 +20,7 @@ INSTALL	?= install
 
 all: $(TARGETS)
 
-libApp_OBJS = appclient.o appinterface.o appserver.o
+libApp_OBJS = appclient.o appinterface.o appserver.o common.o
 libApp_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
 libApp_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl  
 
@@ -33,7 +33,7 @@ libApp.so.0.0 libApp.so.0 libApp.so: $(libApp_OBJS)
 	$(LN) -s -- libApp.so.0.0 libApp.so.0
 	$(LN) -s -- libApp.so.0.0 libApp.so
 
-appclient.o: appclient.c appinterface.h ../include/System/App/appclient.h
+appclient.o: appclient.c appinterface.h ../include/System/App/appclient.h common.h
 	$(CC) $(libApp_CFLAGS) -c appclient.c
 
 appinterface.o: appinterface.c ../include/System/App/appserver.h ../config.h
@@ -42,6 +42,9 @@ appinterface.o: appinterface.c ../include/System/App/appserver.h ../config.h
 appserver.o: appserver.c appinterface.h ../include/System/App/appserver.h ../config.h
 	$(CC) $(libApp_CFLAGS) -c appserver.c
 
+common.o: common.c
+	$(CC) $(libApp_CFLAGS) -c common.c
+
 clean:
 	$(RM) -- $(libApp_OBJS)
 

src/appclient.c

@@ -39,6 +39,7 @@
 #include <System.h>
 #include "System/App/appclient.h"
 #include "appinterface.h"
+#include "common.h"
 
 
 /* AppClient */
@@ -334,8 +335,6 @@ static int _new_connect(AppClient * appclient, char const * app)
 	const char init[] = "Init";
 	struct sockaddr_in sa;
 	int32_t port = -1;
-	int optval = 1;
-	int res;
 
 #ifdef DEBUG
 	fprintf(stderr, "DEBUG: %s(%p, \"%s\")\n", __func__, (void *)appclient,
@@ -347,14 +346,7 @@ static int _new_connect(AppClient * appclient, char const * app)
 	sa.sin_port = htons(appinterface_get_port(appclient->interface));
 	if(_connect_addr(init, &sa.sin_addr.s_addr) != 0)
 		return 1;
-#ifdef TCP_NODELAY
+	common_socket_set_nodelay(appclient->fd, 1);
-	res = setsockopt(appclient->fd, SOL_SOCKET, TCP_NODELAY, &optval,
-			sizeof(optval));
-# ifdef DEBUG
-	if(res != 0)
-		fprintf(stderr, "%s%s%s", init, ": ", strerror(errno));
-# endif
-#endif
 	if(connect(appclient->fd, (struct sockaddr *)&sa, sizeof(sa)) != 0)
 		return error_set_code(1, "%s%s%s", init, ": ", strerror(errno));
 #ifdef DEBUG

src/common.c

@@ -0,0 +1,42 @@
+/* $Id$ */
+/* Copyright (c) 2012 Pierre Pronchery <khorben@defora.org> */
+/* This file is part of DeforaOS System libApp */
+/* This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+
+
+#include <sys/socket.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+
+
+/* common_socket_set_nodelay */
+int common_socket_set_nodelay(int fd, int nodelay)
+{
+	int ret = -1;
+#ifdef TCP_NODELAY
+	int optval = nodelay ? 1 : 0;
+
+	ret = setsockopt(fd, SOL_SOCKET, TCP_NODELAY, &optval, sizeof(optval));
+# ifdef DEBUG
+	if(ret != 0)
+		fprintf(stderr, "%s%s", "libApp: TCP_NODELAY: ",
+				strerror(errno));
+# endif
+	return (ret == 0) ? 0 : -1;
+#else
+	errno = ENOSYS;
+	return ret;
+#endif
+}

src/common.h

@@ -0,0 +1,25 @@
+/* $Id$ */
+/* Copyright (c) 2012 Pierre Pronchery <khorben@defora.org> */
+/* This file is part of DeforaOS System libApp */
+/* This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+
+
+#ifndef LIBAPP_COMMON_H
+# define LIBAPP_COMMON_H
+
+
+/* functions */
+int common_socket_set_nodelay(int fd, int nodelay);
+
+#endif /* !LIBAPP_COMMON_H */

src/project.conf

@@ -6,17 +6,17 @@ cflags_force=-W -fPIC `pkg-config --cflags libSystem`
 cflags=-Wall -g -O2 -pedantic
 ldflags_force=`pkg-config --libs libSystem`
 ldflags=-lssl
-dist=Makefile,appinterface.h
+dist=Makefile,appinterface.h,common.h
 
 [libApp]
 type=library
-sources=appclient.c,appinterface.c,appserver.c
+sources=appclient.c,appinterface.c,appserver.c,common.c
 ldflags=`pkg-config --libs openssl` -lssl -lsocket -lws2_32
 #ldflags=-lsocket -lws2_32
 install=$(LIBDIR)
 
 [appclient.c]
-depends=appinterface.h,../include/System/App/appclient.h
+depends=appinterface.h,../include/System/App/appclient.h,common.h
 
 [appinterface.c]
 depends=../include/System/App/appserver.h,../config.h