version 1.2.2.2, 2011/07/14 01:25:11
|
version 1.3.2.4, 2011/08/19 06:58:31
|
Line 52 rpc_srv_dispatchCall(void *arg)
|
Line 52 rpc_srv_dispatchCall(void *arg)
|
rpc_cli_t *c = arg; |
rpc_cli_t *c = arg; |
rpc_srv_t *s; |
rpc_srv_t *s; |
rpc_val_t *vals = NULL, *v = NULL; |
rpc_val_t *vals = NULL, *v = NULL; |
rpc_func_t *f; | rpc_func_t *f = NULL; |
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
struct tagRPCRet *rrpc; |
struct tagRPCRet *rrpc; |
|
rpc_sess_t ses = { 0 }; |
fd_set fds; |
fd_set fds; |
u_char buf[BUFSIZ], *data; |
u_char buf[BUFSIZ], *data; |
int ret, argc = 0, Limit = 0; |
int ret, argc = 0, Limit = 0; |
Line 147 rpc_srv_dispatchCall(void *arg)
|
Line 148 rpc_srv_dispatchCall(void *arg)
|
|
|
argc = 0; |
argc = 0; |
vals = NULL; |
vals = NULL; |
|
memcpy(&ses, &rpc->call_session, sizeof ses); |
if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) { |
if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) { |
rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n"); |
rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n"); |
ret = -6; |
ret = -6; |
Line 155 rpc_srv_dispatchCall(void *arg)
|
Line 157 rpc_srv_dispatchCall(void *arg)
|
ret = -9; |
ret = -9; |
else |
else |
argc = rpc_srv_getValsCall(f, &vals); |
argc = rpc_srv_getValsCall(f, &vals); |
|
|
makeReply: |
makeReply: |
memset(buf, 0, BUFSIZ); |
memset(buf, 0, BUFSIZ); |
rrpc = (struct tagRPCRet*) buf; |
rrpc = (struct tagRPCRet*) buf; |
Limit = sizeof(struct tagRPCRet); |
Limit = sizeof(struct tagRPCRet); |
|
|
memcpy(&rrpc->ret_session, &rpc->call_session, sizeof rrpc->ret_session); | memcpy(&rrpc->ret_session, &ses, sizeof(rpc_sess_t)); |
rrpc->ret_tag = rpc->call_tag; |
rrpc->ret_tag = rpc->call_tag; |
rrpc->ret_hash = rpc->call_hash; |
rrpc->ret_hash = rpc->call_hash; |
rrpc->ret_errno = rpc_Errno; |
rrpc->ret_errno = rpc_Errno; |
Line 173 makeReply:
|
Line 174 makeReply:
|
if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { |
if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { |
for (i = 0; i < argc; i++) |
for (i = 0; i < argc; i++) |
RPC_FREE_VAL(&vals[i]); |
RPC_FREE_VAL(&vals[i]); |
free(vals); | rpc_srv_freeValsCall(f); |
vals = NULL; |
vals = NULL; |
argc = 0; |
argc = 0; |
ret = -7; |
ret = -7; |
Line 221 makeReply:
|
Line 222 makeReply:
|
} |
} |
|
|
RPC_FREE_VAL(&vals[i]); |
RPC_FREE_VAL(&vals[i]); |
free(vals); |
|
vals = NULL; |
|
} |
} |
|
rpc_srv_freeValsCall(f); |
|
vals = NULL; |
|
argc = 0; |
} |
} |
|
|
if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) { |
if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) { |
Line 364 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 395 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_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) { |
if (srv->srv_blob.server.cli_sock == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 422 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 440 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 466 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 485 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 476 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 496 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 508 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
Line 529 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
return -1; |
return -1; |
} |
} |
|
|
if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) { | printf("server.cli_type=%d:%d\n", srv->srv_blob.server.cli_type, SOCK_STREAM); |
LOGERR; | if (srv->srv_blob.server.cli_type == SOCK_STREAM || |
return -1; | 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 (!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 533 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
Line 557 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 543 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
Line 571 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 557 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
Line 590 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
|
* @regProgID = ProgramID for authentication & recognition |
* @regProgID = ProgramID for authentication & recognition |
* @regProcID = ProcessID for authentication & recognition |
* @regProcID = ProcessID for authentication & recognition |
* @concurentClients = Concurent clients at same time to this server |
* @concurentClients = Concurent clients at same time to this server |
* @family = Family socket type, AF_INET or AF_INET6 | * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW |
* @csHost = Host name or IP address for bind server, if NULL any address | * @family = Family type, AF_INET, AF_INET6 or AF_LOCAL |
| * @csHost = Host name or address for bind server, if NULL any address |
* @Port = Port for bind server, if Port == 0 default port is selected |
* @Port = Port for bind server, if Port == 0 default port is selected |
* return: NULL == error or !=NULL bind and created RPC server instance |
* return: NULL == error or !=NULL bind and created RPC server instance |
*/ |
*/ |
rpc_srv_t * |
rpc_srv_t * |
rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, |
rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, |
u_short family, const char *csHost, u_short Port) | int sockType, u_short family, const char *csHost, u_short Port) |
{ |
{ |
rpc_srv_t *srv = NULL; |
rpc_srv_t *srv = NULL; |
int n = 1; |
int n = 1; |
struct hostent *host = NULL; |
struct hostent *host = NULL; |
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 (!concurentClients || !regProgID || (family != AF_INET && family != AF_INET6)) { | if (!concurentClients || !regProgID || |
| (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n"); |
return NULL; |
return NULL; |
} |
} |
if (!Port) |
if (!Port) |
Port = RPC_DEFPORT; |
Port = RPC_DEFPORT; |
if (csHost) { | if (csHost && family != AF_LOCAL) { |
host = gethostbyname2(csHost, family); |
host = gethostbyname2(csHost, family); |
if (!host) { |
if (!host) { |
rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno)); |
rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno)); |
return NULL; |
return NULL; |
} |
} |
} |
} |
|
memset(&sa, 0, sizeof sa); |
|
sa.sa_family = family; |
switch (family) { |
switch (family) { |
case AF_INET: |
case AF_INET: |
memset(&sin, 0, sizeof sin); | sin->sin_len = sizeof(struct sockaddr_in); |
sin.sin_len = sizeof sin; | sin->sin_port = htons(Port); |
sin.sin_family = family; | |
sin.sin_port = htons(Port); | |
if (csHost) |
if (csHost) |
memcpy(&sin.sin_addr, host->h_addr, host->h_length); | memcpy(&sin->sin_addr, host->h_addr, host->h_length); |
break; |
break; |
case AF_INET6: |
case AF_INET6: |
memset(&sin6, 0, sizeof sin6); | sin6->sin6_len = sizeof(struct sockaddr_in6); |
sin6.sin6_len = sizeof sin6; | sin6->sin6_port = htons(Port); |
sin6.sin6_family = family; | |
sin6.sin6_port = htons(Port); | |
if (csHost) |
if (csHost) |
memcpy(&sin6.sin6_addr, host->h_addr, host->h_length); | memcpy(&sin6->sin6_addr, host->h_addr, host->h_length); |
break; |
break; |
|
case AF_LOCAL: |
|
sun->sun_len = sizeof(struct sockaddr_un); |
|
if (csHost) |
|
strlcpy(sun->sun_path, csHost, sizeof sun->sun_path); |
|
break; |
default: |
default: |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n"); |
return NULL; |
return NULL; |
Line 621 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_tid = pthread_self(); |
srv->srv_server.cli_tid = pthread_self(); |
srv->srv_server.cli_parent = srv; |
srv->srv_server.cli_parent = srv; |
if (family == AF_INET) | switch (family) { |
memcpy(&srv->srv_server.cli_sa, &sin, sizeof srv->srv_server.cli_sa); | case AF_INET: |
else | memcpy(&srv->srv_server.cli_sa, sin, sizeof srv->srv_server.cli_sa); |
memcpy(&srv->srv_server.cli_sa, &sin6, sizeof srv->srv_server.cli_sa); | break; |
srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0); | case AF_INET6: |
| 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); |
| unlink(sun->sun_path); |
| break; |
| } |
| |
| /* create server socket */ |
| 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) { |
if (srv->srv_server.cli_sock == -1) { |
LOGERR; |
LOGERR; |
free(srv); |
free(srv); |
Line 644 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
Line 695 rpc_srv_initServer(u_int regProgID, u_int regProcID, i
|
return NULL; |
return NULL; |
} |
} |
|
|
|
/* allocate pool for concurent clients */ |
srv->srv_clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t)); |
srv->srv_clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t)); |
if (!srv->srv_clients) { |
if (!srv->srv_clients) { |
LOGERR; |
LOGERR; |
Line 681 rpc_srv_endServer(rpc_srv_t * __restrict srv)
|
Line 733 rpc_srv_endServer(rpc_srv_t * __restrict srv)
|
|
|
rpc_srv_endBLOBServer(srv); |
rpc_srv_endBLOBServer(srv); |
|
|
|
/* close all clients connections & server socket */ |
for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++) |
for (i = 0, c = srv->srv_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 694 rpc_srv_endServer(rpc_srv_t * __restrict srv)
|
Line 747 rpc_srv_endServer(rpc_srv_t * __restrict srv)
|
srv->srv_numcli = 0; |
srv->srv_numcli = 0; |
} |
} |
|
|
|
/* detach exported calls */ |
pthread_mutex_lock(&srv->srv_mtx); |
pthread_mutex_lock(&srv->srv_mtx); |
while ((f = srv->srv_funcs)) { |
while ((f = srv->srv_funcs)) { |
srv->srv_funcs = f->func_next; |
srv->srv_funcs = f->func_next; |
Line 728 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
Line 782 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 753 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
Line 808 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 763 rpc_srv_execServer(rpc_srv_t * __restrict srv)
|
Line 821 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); |
} |
} |
} |
} |
|
|