version 1.3.2.1, 2011/08/18 15:38:18
|
version 1.3.2.3, 2011/08/18 21:20:54
|
Line 366 makeReply:
|
Line 366 makeReply:
|
|
|
/* |
/* |
* rpc_srv_initBLOBServer() Init & create BLOB Server |
* 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 |
* @Port = Port for bind server, if Port == 0 default port is selected |
* @diskDir = Disk place for BLOB file objects |
* @diskDir = Disk place for BLOB file objects |
* return: -1 == error or 0 bind and created BLOB server instance |
* return: -1 == error or 0 bind and created BLOB server instance |
*/ |
*/ |
int |
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; |
int n = 1; |
struct sockaddr_in sin; | struct sockaddr sa; |
struct sockaddr_in6 sin6; | 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) { |
if (!srv) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n"); |
Line 397 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 401 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
|
|
srv->srv_blob.server.cli_tid = pthread_self(); |
srv->srv_blob.server.cli_tid = pthread_self(); |
srv->srv_blob.server.cli_parent = srv; |
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); | memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa); |
sin.sin_port = htons(Port); | switch (srv->srv_server.cli_sa.sa_family) { |
memcpy(&srv->srv_blob.server.cli_sa, &sin, sizeof(struct sockaddr)); | case AF_INET: |
} else { | sin->sin_port = htons(Port); |
memcpy(&sin6, &srv->srv_server.cli_sa, sizeof sin6); | memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr)); |
sin6.sin6_port = htons(Port); | break; |
memcpy(&srv->srv_blob.server.cli_sa, &sin6, sizeof(struct sockaddr)); | 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_sock = socket(srv->srv_server.cli_sa.sa_family, |
| sockType ? sockType : SOCK_STREAM, 0); |
if (srv->srv_blob.server.cli_sock == -1) { |
if (srv->srv_blob.server.cli_sock == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 424 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 439 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
return -1; |
return -1; |
} |
} |
|
|
|
/* allocate pool for concurent clients */ |
srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t)); |
srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t)); |
if (!srv->srv_blob.clients) { |
if (!srv->srv_blob.clients) { |
LOGERR; |
LOGERR; |
Line 468 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 484 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS); |
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS); |
rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE); |
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++) |
for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++) |
if (c->cli_sa.sa_family) |
if (c->cli_sa.sa_family) |
shutdown(c->cli_sock, SHUT_RDWR); |
shutdown(c->cli_sock, SHUT_RDWR); |
Line 478 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 495 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
srv->srv_blob.clients = NULL; |
srv->srv_blob.clients = NULL; |
} |
} |
|
|
|
/* detach blobs */ |
pthread_mutex_lock(&srv->srv_blob.mtx); |
pthread_mutex_lock(&srv->srv_blob.mtx); |
while ((f = srv->srv_blob.blobs)) { |
while ((f = srv->srv_blob.blobs)) { |
srv->srv_blob.blobs = f->blob_next; |
srv->srv_blob.blobs = f->blob_next; |
Line 510 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
Line 528 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
return -1; |
return -1; |
} |
} |
|
|
if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) { | if (srv->srv_blob.server.cli_type == SOCK_STREAM || |
LOGERR; | srv->srv_blob.server.cli_type == SOCK_SEQPACKET) |
return -1; | if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) { |
} | LOGERR; |
| return -1; |
| } |
|
|
while (!blob_Kill && !rpc_Kill) { |
while (!blob_Kill && !rpc_Kill) { |
for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++) |
for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++) |
Line 535 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
Line 555 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
if (!ret) |
if (!ret) |
continue; |
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) { |
if (c->cli_sock == -1) { |
LOGERR; |
LOGERR; |
continue; |
continue; |
Line 545 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
Line 569 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchVars, c)) { |
if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchVars, c)) { |
LOGERR; |
LOGERR; |
continue; |
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; |
srv->srv_blob.state = disable; |
Line 632 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
Line 661 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
srv->srv_server.cli_parent = srv; |
srv->srv_server.cli_parent = srv; |
switch (family) { |
switch (family) { |
case AF_INET: |
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; |
break; |
case AF_INET6: |
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; |
break; |
case AF_LOCAL: |
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); |
unlink(sun->sun_path); |
break; |
break; |
} |
} |
Line 649 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
Line 678 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
LOGERR; |
LOGERR; |
free(srv); |
free(srv); |
return NULL; |
return NULL; |
} | } else |
| srv->srv_server.cli_type = sockType; |
if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) { |
if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) { |
LOGERR; |
LOGERR; |
close(srv->srv_server.cli_sock); |
close(srv->srv_server.cli_sock); |
Line 750 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
Line 780 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
return -1; |
return -1; |
} |
} |
|
|
if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) { | if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET) |
LOGERR; | if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) { |
return -1; | LOGERR; |
} | return -1; |
| } |
|
|
while (!rpc_Kill) { |
while (!rpc_Kill) { |
for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++) |
for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++) |
Line 775 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
Line 806 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
if (!ret) |
if (!ret) |
continue; |
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) { |
if (c->cli_sock == -1) { |
LOGERR; |
LOGERR; |
continue; |
continue; |
Line 785 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
Line 819 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) { |
if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) { |
LOGERR; |
LOGERR; |
continue; |
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); |
} |
} |
} |
} |
|
|