version 1.5.2.8, 2011/11/03 13:35:39
|
version 1.5.2.11, 2011/11/03 15:22:47
|
Line 101 rpc_srv_dispatchCall(void *arg)
|
Line 101 rpc_srv_dispatchCall(void *arg)
|
if (ret < sizeof(struct tagRPCCall)) { |
if (ret < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); |
rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); |
ret = -4; |
ret = -4; |
break; | if (s->srv_kill != kill) |
| continue; |
| else |
| break; |
} else |
} else |
rpc = (struct tagRPCCall*) buf; |
rpc = (struct tagRPCCall*) buf; |
/* check RPC packet session info */ |
/* check RPC packet session info */ |
Line 117 rpc_srv_dispatchCall(void *arg)
|
Line 120 rpc_srv_dispatchCall(void *arg)
|
|
|
/* RPC is OK! Go decapsulate variables ... */ |
/* RPC is OK! Go decapsulate variables ... */ |
if (ntohs(rpc->call_argc)) { |
if (ntohs(rpc->call_argc)) { |
arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, | arr = io_buffer2vars(buf + Limit, s->srv_netbuf - Limit, |
ntohs(rpc->call_argc), 1); |
ntohs(rpc->call_argc), 1); |
if (!arr) { |
if (!arr) { |
ret = -5; |
ret = -5; |
Line 160 makeReply:
|
Line 163 makeReply:
|
|
|
if (argc && arr) { |
if (argc && arr) { |
/* Go Encapsulate variables ... */ |
/* Go Encapsulate variables ... */ |
if ((i = io_vals2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) { | if ((i = io_vars2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) { |
rpc_srv_freeVars(f); |
rpc_srv_freeVars(f); |
argc = 0; |
argc = 0; |
ret = -7; |
ret = -7; |
Line 183 makeReply:
|
Line 186 makeReply:
|
rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, " |
rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, " |
"really is %d\n", Limit, ret); |
"really is %d\n", Limit, ret); |
ret = -9; |
ret = -9; |
break; | if (s->srv_kill != kill) |
| continue; |
| else |
| break; |
} |
} |
} while (ret > -1 || s->srv_kill != kill); |
} while (ret > -1 || s->srv_kill != kill); |
|
|
Line 249 rpc_srv_dispatchVars(void *arg)
|
Line 255 rpc_srv_dispatchVars(void *arg)
|
if (ret < sizeof(struct tagBLOBHdr)) { |
if (ret < sizeof(struct tagBLOBHdr)) { |
rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n"); |
rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n"); |
ret = -4; |
ret = -4; |
break; | if (s->srv_kill != kill && s->srv_blob.state != kill) |
| continue; |
| else |
| break; |
} else |
} else |
blob = (struct tagBLOBHdr*) buf; |
blob = (struct tagBLOBHdr*) buf; |
/* check BLOB packet session info */ |
/* check BLOB packet session info */ |
Line 310 makeReply:
|
Line 319 makeReply:
|
rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, " |
rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, " |
"really is %d\n", sizeof buf, ret); |
"really is %d\n", sizeof buf, ret); |
ret = -9; |
ret = -9; |
break; | if (s->srv_kill != kill && s->srv_blob.state != kill) |
| continue; |
| else |
| break; |
} |
} |
} while (ret > -1 || s->srv_kill != kill); |
} while (ret > -1 || s->srv_kill != kill); |
|
|
Line 343 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 355 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
rpc_SetErr(EPERM, "Warning:: Already started BLOB server!\n"); |
rpc_SetErr(EPERM, "Warning:: Already started BLOB server!\n"); |
return 0; |
return 0; |
} |
} |
if (!Port) |
|
Port = RPC_DEFPORT + 1; |
|
|
|
memset(&srv->srv_blob, 0, sizeof srv->srv_blob); |
memset(&srv->srv_blob, 0, sizeof srv->srv_blob); |
if (access(diskDir, R_OK | W_OK) == -1) { |
if (access(diskDir, R_OK | W_OK) == -1) { |
Line 357 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 367 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
srv->srv_blob.server.cli_parent = srv; |
srv->srv_blob.server.cli_parent = srv; |
|
|
memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa); |
memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa); |
switch (srv->srv_server.cli_sa.sa.sa_family) { | switch (sa.sa.sa_family) { |
case AF_INET: |
case AF_INET: |
sa.sin.sin_port = htons(Port); | sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1); |
memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); | |
break; |
break; |
case AF_INET6: |
case AF_INET6: |
sa.sin6.sin6_port = htons(Port); | sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1); |
memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); | |
break; |
break; |
case AF_LOCAL: |
case AF_LOCAL: |
strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); |
strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); |
memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); |
|
break; |
break; |
default: |
default: |
return -1; |
return -1; |
} |
} |
|
memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); |
|
|
/* create BLOB server socket */ |
/* create BLOB server socket */ |
srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0); |
srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0); |
Line 708 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 716 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
pthread_mutex_lock(&(*psrv)->srv_mtx); |
pthread_mutex_lock(&(*psrv)->srv_mtx); |
while ((f = (*psrv)->srv_funcs)) { |
while ((f = (*psrv)->srv_funcs)) { |
(*psrv)->srv_funcs = f->func_next; |
(*psrv)->srv_funcs = f->func_next; |
rpc_srv_destroyVars(f); | io_freeVars(&f->func_vars); |
free(f); |
free(f); |
} |
} |
pthread_mutex_unlock(&(*psrv)->srv_mtx); |
pthread_mutex_unlock(&(*psrv)->srv_mtx); |