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.7 and 1.3.2.8

version 1.3.2.7, 2011/09/03 13:18:26	version 1.3.2.8, 2011/09/06 23:58:48
Line 55 rpcServerClients(rpc_func_t call, int ic, array_t iv	Line 55 rpcServerClients(rpc_func_t call, int ic, array_t iv
array_t *vals;	array_t *vals;
rpc_cli_t *cli;	rpc_cli_t *cli;
register int i;	register int i;
	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_in *s;
Line 69 rpcServerClients(rpc_func_t call, int ic, array_t iv	Line 70 rpcServerClients(rpc_func_t call, int ic, array_t iv

rpc_srv_getVars(call, &vals);	rpc_srv_getVars(call, &vals);

if (!(val = calloc(srv->srv_numcli, STRSIZ))) {	len = srv->srv_numcli * STRSIZ;
	if (!(val = malloc(len))) {
LOGERR;	LOGERR;
return -1;	return -1;
} else	} else
memset(val, 0, srv->srv_numcli * STRSIZ);	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_family)
Line 94 rpcServerClients(rpc_func_t call, int ic, array_t iv	Line 96 rpcServerClients(rpc_func_t call, int ic, array_t iv
break;	break;
}	}
if (str)	if (str)
strlcat(val, (char) str, srv->srv_numcli STRSIZ);	strlcat(val, (char*) str, len);
else	else
strlcat(val, "0.0.0.0", srv->srv_numcli * STRSIZ);	strlcat(val, "0.0.0.0", len);
strlcat(val, " ", srv->srv_numcli * STRSIZ);	strlcat(val, " ", len);
}	}

AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);	AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);
Line 216 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i	Line 218 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i
{	{
rpc_srv_t *srv;	rpc_srv_t *srv;
array_t *vals;	array_t *vals;
ait_val_t *v;
rpc_blob_t *b;	rpc_blob_t *b;
register int i;	register int i;
char *val, str[64];	char *val, str[64];
Line 236 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i	Line 237 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i

if (!(val = malloc(len))) {	if (!(val = malloc(len))) {
LOGERR;	LOGERR;
	pthread_mutex_unlock(&srv->srv_blob.mtx);
return -1;	return -1;
} else	} else
memset(val, 0, len);	memset(val, 0, len);
Line 245 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i	Line 247 rpcBLOBServerVars(rpc_func_t call, int ic, array_t i
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, b->blob_len, b->blob_data);
strlcat(val, str, len);	strlcat(val, str, len);
}	}
pthread_mutex_unlock(&srv->srv_blob.mtx);

v = io_array(vals, 0, ait_val_t*);	AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);
AIT_SET_STR(v, val);
free(val);	free(val);
	pthread_mutex_unlock(&srv->srv_blob.mtx);
return 0;	return 0;
}	}

Line 280 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t	Line 281 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
array_t *vals;	array_t *vals;
rpc_cli_t *cli;	rpc_cli_t *cli;
register int i;	register int i;
	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_in *s;
Line 294 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t	Line 296 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t

rpc_srv_getVars(call, &vals);	rpc_srv_getVars(call, &vals);

if (!(val = calloc(srv->srv_numcli, STRSIZ))) {	len = srv->srv_numcli * STRSIZ;
	if (!(val = malloc(len))) {
LOGERR;	LOGERR;
return -1;	return -1;
} else	} else
memset(val, 0, srv->srv_numcli * STRSIZ);	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_family)
Line 319 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t	Line 322 rpcBLOBServerClients(rpc_func_t *call, int ic, array_t
break;	break;
}	}
if (str)	if (str)
strlcat(val, (char) str, srv->srv_numcli STRSIZ);	strlcat(val, (char*) str, len);
else	else
strlcat(val, "0.0.0.0", srv->srv_numcli * STRSIZ);	strlcat(val, "0.0.0.0", len);
strlcat(val, " ", srv->srv_numcli * STRSIZ);	strlcat(val, " ", len);
}	}

AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);	AIT_SET_STR(io_array(vals, 0, ait_val_t*), val);

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

Removed from v.1.3.2.7
changed lines
	Added in v.1.3.2.8