version 1.12, 2012/11/13 09:22:10
|
version 1.12.2.1, 2012/11/16 08:33:06
|
Line 46 SUCH DAMAGE.
|
Line 46 SUCH DAMAGE.
|
#include "global.h" |
#include "global.h" |
|
|
|
|
|
static void *acceptClients(sched_task_t *); |
|
static void *closeClient(sched_task_t *); |
|
static sched_task_func_t cbProto[SOCK_RAW][2] = { |
|
{ acceptClients, closeClient }, |
|
{ acceptClients, closeClient }, |
|
{ NULL, NULL } |
|
}; |
|
|
|
|
static void * |
static void * |
closeClient(sched_task_t *task) |
closeClient(sched_task_t *task) |
{ |
{ |
Line 114 txPacket(sched_task_t *task)
|
Line 123 txPacket(sched_task_t *task)
|
ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); |
ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); |
if (ret == -1 || ret != wlen) { |
if (ret == -1 || ret != wlen) { |
/* close connection */ |
/* close connection */ |
schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0); | schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
| c, 42, NULL, 0); |
} |
} |
|
|
return NULL; |
return NULL; |
Line 192 rxPacket(sched_task_t *task)
|
Line 202 rxPacket(sched_task_t *task)
|
rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); |
rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); |
if (rlen < 1) { |
if (rlen < 1) { |
/* close connection */ |
/* close connection */ |
schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0); | schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], |
| c, 42, NULL, 0); |
return NULL; |
return NULL; |
} else { |
} else { |
rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ |
rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ |
Line 691 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 702 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
* @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) |
* @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) |
* @csHost = Host name or address for bind server, if NULL any address |
* @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 |
|
* @proto = Protocol, if == 0 choose SOCK_STREAM |
* 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_char regProcID, int concurentClients, |
rpc_srv_initServer(u_int regProgID, u_char regProcID, int concurentClients, |
int netBuf, const char *csHost, u_short Port) | int netBuf, const char *csHost, u_short Port, int proto) |
{ |
{ |
int n = 1; |
int n = 1; |
rpc_srv_t *srv = NULL; |
rpc_srv_t *srv = NULL; |
io_sockaddr_t sa = IO_SOCKADDR_INIT; |
io_sockaddr_t sa = IO_SOCKADDR_INIT; |
|
|
if (!concurentClients || !regProgID) { | if (!concurentClients || !regProgID || (proto < 0 || proto > SOCK_DGRAM)) { |
rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); |
rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); |
return NULL; |
return NULL; |
} |
} |
|
if (!proto) |
|
proto = SOCK_STREAM; |
if (!io_gethostbyname(csHost, Port, &sa)) |
if (!io_gethostbyname(csHost, Port, &sa)) |
return NULL; |
return NULL; |
if (!Port) |
if (!Port) |
Line 729 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 743 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
} else |
} else |
memset(srv, 0, sizeof(rpc_srv_t)); |
memset(srv, 0, sizeof(rpc_srv_t)); |
|
|
|
srv->srv_proto = proto; |
srv->srv_netbuf = netBuf; |
srv->srv_netbuf = netBuf; |
srv->srv_session.sess_version = RPC_VERSION; |
srv->srv_session.sess_version = RPC_VERSION; |
srv->srv_session.sess_program = regProgID; |
srv->srv_session.sess_program = regProgID; |
Line 762 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
Line 777 rpc_srv_initServer(u_int regProgID, u_char regProcID,
|
} |
} |
|
|
/* create server socket */ |
/* create server socket */ |
srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0); | srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, srv->srv_proto, 0); |
if (srv->srv_server.cli_sock == -1) { |
if (srv->srv_server.cli_sock == -1) { |
LOGERR; |
LOGERR; |
io_arrayDestroy(&srv->srv_clients); |
io_arrayDestroy(&srv->srv_clients); |
Line 852 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 867 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
fcntl(srv->srv_server.cli_sock, F_SETFL, |
fcntl(srv->srv_server.cli_sock, F_SETFL, |
fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK); |
fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
if (!schedRead(srv->srv_root, acceptClients, srv, srv->srv_server.cli_sock, NULL, 0)) { | if (!schedRead(srv->srv_root, cbProto[srv->srv_proto][CB_ACCEPTCLIENT], srv, |
| srv->srv_server.cli_sock, NULL, 0)) { |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
return -1; |
return -1; |
} |
} |