--- libaitrpc/src/srv.c	2011/08/18 15:38:18	1.3.2.1
+++ libaitrpc/src/srv.c	2011/08/19 09:32:38	1.3.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.3.2.1 2011/08/18 15:38:18 misho Exp $
+* $Id: srv.c,v 1.3.2.8 2011/08/19 09:32:38 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -76,7 +76,7 @@ rpc_srv_dispatchCall(void *arg)
 			ret = -2;
 		}
 		memset(buf, 0, BUFSIZ);
-		if ((ret = recv(c->cli_sock, buf, BUFSIZ, 0)) == -1) {
+		if ((ret = read(c->cli_sock, buf, BUFSIZ)) == -1) {
 			LOGERR;
 			ret = -3;
 			break;
@@ -156,7 +156,7 @@ rpc_srv_dispatchCall(void *arg)
 			if ((ret = rpc_srv_execCall(f, rpc, v)) == -1)
 				ret = -9;
 			else
-				argc = rpc_srv_getValsCall(f, &vals);
+				argc = rpc_srv_getVars(f, &vals);
 makeReply:
 		memset(buf, 0, BUFSIZ);
 		rrpc = (struct tagRPCRet*) buf;
@@ -174,7 +174,7 @@ makeReply:
 			if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
 				for (i = 0; i < argc; i++)
 					RPC_FREE_VAL(&vals[i]);
-				rpc_srv_freeValsCall(f);
+				rpc_srv_freeVars(f);
 				vals = NULL;
 				argc = 0;
 				ret = -7;
@@ -223,12 +223,12 @@ makeReply:
 
 				RPC_FREE_VAL(&vals[i]);
 			}
-			rpc_srv_freeValsCall(f);
+			rpc_srv_freeVars(f);
 			vals = NULL;
 			argc = 0;
 		}
 
-		if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) {
+		if ((ret = write(c->cli_sock, buf, Limit)) == -1) {
 			LOGERR;
 			ret = -8;
 			break;
@@ -280,7 +280,7 @@ rpc_srv_dispatchVars(void *arg)
 		}
 
 		memset(buf, 0, sizeof buf);
-		if ((ret = recv(c->cli_sock, buf, sizeof buf, 0)) == -1) {
+		if ((ret = read(c->cli_sock, buf, sizeof buf)) == -1) {
 			LOGERR;
 			ret = -3;
 			break;
@@ -343,7 +343,7 @@ makeReply:
 		// Replay to client!
 		blob->hdr_cmd = ret < 0 ? error : ok;
 		blob->hdr_ret = ret;
-		if ((ret = send(c->cli_sock, buf, sizeof buf, 0)) == -1) {
+		if ((ret = write(c->cli_sock, buf, sizeof buf)) == -1) {
 			LOGERR;
 			ret = -8;
 			break;
@@ -366,16 +366,20 @@ makeReply:
 
 /*
  * rpc_srv_initBLOBServer() Init & create BLOB Server
+ * @srv = RPC server instance
+ * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW
  * @Port = Port for bind server, if Port == 0 default port is selected
  * @diskDir = Disk place for BLOB file objects
  * return: -1 == error or 0 bind and created BLOB server instance
  */
 int
-rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir)
+rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int sockType, u_short Port, const char *diskDir)
 {
 	int n = 1;
-	struct sockaddr_in sin;
-	struct sockaddr_in6 sin6;
+	struct sockaddr sa;
+	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
+	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
+	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
 
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n");
@@ -397,17 +401,29 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 
 	srv->srv_blob.server.cli_tid = pthread_self();
 	srv->srv_blob.server.cli_parent = srv;
-	if (srv->srv_server.cli_sa.sa_family == AF_INET) {
-		memcpy(&sin, &srv->srv_server.cli_sa, sizeof sin);
-		sin.sin_port = htons(Port);
-		memcpy(&srv->srv_blob.server.cli_sa, &sin, sizeof(struct sockaddr));
-	} else {
-		memcpy(&sin6, &srv->srv_server.cli_sa, sizeof sin6);
-		sin6.sin6_port = htons(Port);
-		memcpy(&srv->srv_blob.server.cli_sa, &sin6, sizeof(struct sockaddr));
+
+	memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa);
+	switch (srv->srv_server.cli_sa.sa_family) {
+		case AF_INET:
+			sin->sin_port = htons(Port);
+			memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr));
+			break;
+		case AF_INET6:
+			sin6->sin6_port = htons(Port);
+			memcpy(&srv->srv_blob.server.cli_sa, sin6, sizeof(struct sockaddr));
+			break;
+		case AF_LOCAL:
+			strlcat(sun->sun_path, ".blob", sizeof sun->sun_path);
+			memcpy(&srv->srv_blob.server.cli_sa, sun, sizeof(struct sockaddr));
+			break;
+		default:
+			return -1;
 	}
 
-	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, SOCK_STREAM, 0);
+	/* create BLOB server socket */
+	srv->srv_blob.server.cli_type = sockType ? sockType : SOCK_STREAM;
+	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, 
+			srv->srv_blob.server.cli_type, 0);
 	if (srv->srv_blob.server.cli_sock == -1) {
 		LOGERR;
 		return -1;
@@ -424,6 +440,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		return -1;
 	}
 
+	/* allocate pool for concurent clients */
 	srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t));
 	if (!srv->srv_blob.clients) {
 		LOGERR;
@@ -468,6 +485,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS);
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE);
 
+	/* close all clients connections & server socket */
 	for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)
 		if (c->cli_sa.sa_family)
 			shutdown(c->cli_sock, SHUT_RDWR);
@@ -478,6 +496,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 		srv->srv_blob.clients = NULL;
 	}
 
+	/* detach blobs */
 	pthread_mutex_lock(&srv->srv_blob.mtx);
 	while ((f = srv->srv_blob.blobs)) {
 		srv->srv_blob.blobs = f->blob_next;
@@ -510,12 +529,14 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
-		LOGERR;
-		return -1;
-	}
+	if (srv->srv_blob.server.cli_type == SOCK_STREAM || 
+			srv->srv_blob.server.cli_type == SOCK_SEQPACKET)
+		if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
+			LOGERR;
+			return -1;
+		}
 
-	while (!blob_Kill && !rpc_Kill) {
+	while (srv->srv_blob.state != kill && srv->srv_kill != kill) {
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;
@@ -535,7 +556,11 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		if (!ret)
 			continue;
 
-		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen);
+		if (srv->srv_blob.server.cli_type == SOCK_STREAM || 
+				srv->srv_blob.server.cli_type == SOCK_SEQPACKET)
+			c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen);
+		else
+			c->cli_sock = dup(srv->srv_blob.server.cli_sock);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
@@ -545,7 +570,12 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchVars, c)) {
 			LOGERR;
 			continue;
-		}
+		} else
+			if (srv->srv_blob.server.cli_type == SOCK_STREAM || 
+					srv->srv_blob.server.cli_type == SOCK_SEQPACKET)
+				pthread_detach(c->cli_tid);
+			else
+				pthread_join(c->cli_tid, NULL);
 	}
 
 	srv->srv_blob.state = disable;
@@ -632,19 +662,20 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	srv->srv_server.cli_parent = srv;
 	switch (family) {
 		case AF_INET:
-			memcpy(&srv->srv_server.cli_sa, &sin, sizeof srv->srv_server.cli_sa);
+			memcpy(&srv->srv_server.cli_sa, sin, sizeof srv->srv_server.cli_sa);
 			break;
 		case AF_INET6:
-			memcpy(&srv->srv_server.cli_sa, &sin6, sizeof srv->srv_server.cli_sa);
+			memcpy(&srv->srv_server.cli_sa, sin6, sizeof srv->srv_server.cli_sa);
 			break;
 		case AF_LOCAL:
-			memcpy(&srv->srv_server.cli_sa, &sun, sizeof srv->srv_server.cli_sa);
+			memcpy(&srv->srv_server.cli_sa, sun, sizeof srv->srv_server.cli_sa);
 			unlink(sun->sun_path);
 			break;
 	}
 
 	/* create server socket */
-	srv->srv_server.cli_sock = socket(family, sockType ? sockType : SOCK_STREAM, 0);
+	srv->srv_server.cli_type = sockType ? sockType : SOCK_STREAM;
+	srv->srv_server.cli_sock = socket(family, srv->srv_server.cli_type, 0);
 	if (srv->srv_server.cli_sock == -1) {
 		LOGERR;
 		free(srv);
@@ -750,12 +781,13 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {
-		LOGERR;
-		return -1;
-	}
+	if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET)
+		if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {
+			LOGERR;
+			return -1;
+		}
 
-	while (!rpc_Kill) {
+	while (srv->srv_kill != kill) {
 		for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;
@@ -775,7 +807,10 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		if (!ret)
 			continue;
 
-		c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen);
+		if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET)
+			c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen);
+		else
+			c->cli_sock = dup(srv->srv_server.cli_sock);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
@@ -785,6 +820,11 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) {
 			LOGERR;
 			continue;
+		} else {
+			if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET)
+				pthread_detach(c->cli_tid);
+			else
+				pthread_join(c->cli_tid, NULL);
 		}
 	}