libaitrpc/src/builtin.c - diff

Return to builtin.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

Diff for /libaitrpc/src/builtin.c between versions 1.3.2.9 and 1.5

version 1.3.2.9, 2011/09/07 00:30:04	version 1.5, 2011/11/03 15:32:21
Line 58 rpcServerClients(rpc_func_t call, int ic, array_t iv	Line 58 rpcServerClients(rpc_func_t call, int ic, array_t iv
int len;	int len;
const char *str = NULL;	const char *str = NULL;
char *val, wrk[INET6_ADDRSTRLEN];	char *val, wrk[INET6_ADDRSTRLEN];
struct sockaddr_in *s;
struct sockaddr_in6 *s6;
struct sockaddr_un *su;

RPC_CALLBACK_CHECK_INPUT(call);	RPC_CALLBACK_CHECK_INPUT(call);
if (!call->func_parent)	if (!call->func_parent)
Line 78 rpcServerClients(rpc_func_t call, int ic, array_t iv	Line 75 rpcServerClients(rpc_func_t call, int ic, array_t iv
memset(val, 0, len);	memset(val, 0, len);

for (i = 0, cli = srv->srv_clients; i < srv->srv_numcli; i++, cli++) {	for (i = 0, cli = srv->srv_clients; i < srv->srv_numcli; i++, cli++) {
if (!cli->cli_sa.sa_family)	if (!cli->cli_sa.sa.sa_family)
continue;	continue;

switch (cli->cli_sa.sa_family) {	switch (cli->cli_sa.sa.sa_family) {
case AF_INET:	case AF_INET:
s = (struct sockaddr_in*) &cli->cli_sa;	str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin.sin_addr, wrk, sizeof wrk);
str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk);
break;	break;
case AF_INET6:	case AF_INET6:
s6 = (struct sockaddr_in6*) &cli->cli_sa;	str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin6.sin6_addr, wrk, sizeof wrk);
str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk);
break;	break;
case AF_LOCAL:	case AF_LOCAL:
su = (struct sockaddr_un*) &cli->cli_sa;	str = cli->cli_sa.sun.sun_path;
str = su->sun_path;
break;	break;
}	}
if (str)	if (str)
Line 138 rpcServerCalls(rpc_func_t call, int ic, array_t iv)	Line 132 rpcServerCalls(rpc_func_t call, int ic, array_t iv)
if (*f->func_name) {	if (*f->func_name) {
memset(str, 0, sizeof str);	memset(str, 0, sizeof str);
snprintf(str, sizeof str, "/%s/%s(%d); ",	snprintf(str, sizeof str, "/%s/%s(%d); ",
f->func_file, f->func_name, io_arraySize(f->func_vars));	f->func_file ? f->func_file : "",
	f->func_name, io_arraySize(f->func_vars));
strlcat(val, str, len);	strlcat(val, str, len);
}	}
}	}
Line 244 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i	Line 239 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i
for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next);	for (i = 0, b = srv->srv_blob.blobs; b; i++, b = b->blob_next);
len = i * sizeof str;	len = i * sizeof str;

	if (!len) {
	AIT_SET_STR(io_array(vals, 0, ait_val_t*), "");
	pthread_mutex_unlock(&srv->srv_blob.mtx);
	return 0;
	}

if (!(val = malloc(len))) {	if (!(val = malloc(len))) {
LOGERR;	LOGERR;
pthread_mutex_unlock(&srv->srv_blob.mtx);	pthread_mutex_unlock(&srv->srv_blob.mtx);
Line 253 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i	Line 254 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i

for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) {	for (b = srv->srv_blob.blobs, i = 0; b; i++, b = b->blob_next) {
memset(str, 0, sizeof str);	memset(str, 0, sizeof str);
snprintf(str, sizeof str, "0x%0X(%lu)=%p ", b->blob_var, b->blob_len, b->blob_data);	snprintf(str, sizeof str, "0x%0X(%lu)=%p ", b->blob_var, (u_long) b->blob_len, b->blob_data);
strlcat(val, str, len);	strlcat(val, str, len);
}	}

Line 293 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t	Line 294 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
int len;	int len;
const char *str = NULL;	const char *str = NULL;
char *val, wrk[INET6_ADDRSTRLEN];	char *val, wrk[INET6_ADDRSTRLEN];
struct sockaddr_in *s;
struct sockaddr_in6 *s6;
struct sockaddr_un *su;

RPC_CALLBACK_CHECK_INPUT(call);	RPC_CALLBACK_CHECK_INPUT(call);
if (!call->func_parent)	if (!call->func_parent)
Line 322 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t	Line 320 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
memset(val, 0, len);	memset(val, 0, len);

for (i = 0, cli = srv->srv_blob.clients; i < srv->srv_numcli; i++, cli++) {	for (i = 0, cli = srv->srv_blob.clients; i < srv->srv_numcli; i++, cli++) {
if (!cli->cli_sa.sa_family)	if (!cli->cli_sa.sa.sa_family)
continue;	continue;

switch (cli->cli_sa.sa_family) {	switch (cli->cli_sa.sa.sa_family) {
case AF_INET:	case AF_INET:
s = (struct sockaddr_in*) &cli->cli_sa;	str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin.sin_addr, wrk, sizeof wrk);
str = inet_ntop(cli->cli_sa.sa_family, &s->sin_addr, wrk, sizeof wrk);
break;	break;
case AF_INET6:	case AF_INET6:
s6 = (struct sockaddr_in6*) &cli->cli_sa;	str = inet_ntop(cli->cli_sa.sa.sa_family, &cli->cli_sa.sin6.sin6_addr, wrk, sizeof wrk);
str = inet_ntop(cli->cli_sa.sa_family, &s6->sin6_addr, wrk, sizeof wrk);
break;	break;
case AF_LOCAL:	case AF_LOCAL:
su = (struct sockaddr_un*) &cli->cli_sa;	str = cli->cli_sa.sun.sun_path;
str = su->sun_path;
break;	break;
}	}
if (str)	if (str)

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.3.2.9
changed lines
	Added in v.1.5