libaitrpc/src/srv.c - diff

Return to srv.c CVS log

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

Diff for /libaitrpc/src/srv.c between versions 1.26.2.2 and 1.26.2.5

version 1.26.2.2, 2015/06/24 22:39:32	version 1.26.2.5, 2015/06/25 22:39:05
Line 212 txPacket(sched_task_t *task)	Line 212 txPacket(sched_task_t *task)
/* Go Encapsulate variables */	/* Go Encapsulate variables */
ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,	ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,
RPC_RETVARS(c));	RPC_RETVARS(c));
/* Free return values */
ait_freeVars(&c->cli_vars);
if (ret == -1) {	if (ret == -1) {
rpc_SetErr(EBADRPC, "Prepare RPC packet failed");	rpc_SetErr(EBADRPC, "Prepare RPC packet failed");

Line 225 txPacket(sched_task_t *task)	Line 223 txPacket(sched_task_t *task)
}	}
}	}

	/* Free return values */
	ait_freeVars(&c->cli_vars);

rpc->call_len = htonl(wlen);	rpc->call_len = htonl(wlen);
rpc->call_io = RPC_ACK;	rpc->call_io = RPC_ACK;

Line 303 execCall(sched_task_t *task)	Line 304 execCall(sched_task_t *task)
rpc->call_rep.eno = RPC_ERROR(rpc_Errno);	rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
}	}
rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
	ait_freeVars(&c->cli_vars);
} else {	} else {
rpc->call_rep.eno ^= rpc->call_rep.eno;	rpc->call_rep.eno ^= rpc->call_rep.eno;
if (argc) {	if (argc) {
Line 501 txUDPPacket(sched_task_t *task)	Line 503 txUDPPacket(sched_task_t *task)
/* Go Encapsulate variables */	/* Go Encapsulate variables */
ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,	ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,
RPC_RETVARS(c));	RPC_RETVARS(c));
/* Free return values */
ait_freeVars(&c->cli_vars);
if (ret == -1) {	if (ret == -1) {
rpc_SetErr(EBADRPC, "Prepare RPC packet failed");	rpc_SetErr(EBADRPC, "Prepare RPC packet failed");
rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
Line 513 txUDPPacket(sched_task_t *task)	Line 513 txUDPPacket(sched_task_t *task)
}	}
}	}

	/* Free return values */
	ait_freeVars(&c->cli_vars);

rpc->call_len = htonl(wlen);	rpc->call_len = htonl(wlen);
rpc->call_io = RPC_ACK;	rpc->call_io = RPC_ACK;

Line 693 txRAWPacket(sched_task_t *task)	Line 696 txRAWPacket(sched_task_t *task)
/* Go Encapsulate variables */	/* Go Encapsulate variables */
ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,	ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,
RPC_RETVARS(c));	RPC_RETVARS(c));
/* Free return values */
ait_freeVars(&c->cli_vars);
if (ret == -1) {	if (ret == -1) {
rpc_SetErr(EBADRPC, "Prepare RPC packet failed");	rpc_SetErr(EBADRPC, "Prepare RPC packet failed");
rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
Line 705 txRAWPacket(sched_task_t *task)	Line 706 txRAWPacket(sched_task_t *task)
}	}
}	}

	/* Free return values */
	ait_freeVars(&c->cli_vars);

rpc->call_len = htonl(wlen);	rpc->call_len = htonl(wlen);
rpc->call_io = RPC_ACK;	rpc->call_io = RPC_ACK;

Line 866 txBPFPacket(sched_task_t *task)	Line 870 txBPFPacket(sched_task_t *task)
/* Go Encapsulate variables */	/* Go Encapsulate variables */
ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,	ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,
RPC_RETVARS(c));	RPC_RETVARS(c));
/* Free return values */
ait_freeVars(&RPC_RETVARS(c));
if (ret == -1) {	if (ret == -1) {
rpc_SetErr(EBADRPC, "Prepare RPC packet failed");	rpc_SetErr(EBADRPC, "Prepare RPC packet failed");
rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
Line 878 txBPFPacket(sched_task_t *task)	Line 880 txBPFPacket(sched_task_t *task)
}	}
}	}

	/* Free return values */
	ait_freeVars(&RPC_RETVARS(c));

rpc->call_len = htonl(wlen);	rpc->call_len = htonl(wlen);
rpc->call_io = RPC_ACK;	rpc->call_io = RPC_ACK;

Line 1036 txEXTPacket(sched_task_t *task)	Line 1041 txEXTPacket(sched_task_t *task)
/* Go Encapsulate variables */	/* Go Encapsulate variables */
ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,	ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen,
RPC_RETVARS(c));	RPC_RETVARS(c));
/* Free return values */
ait_freeVars(&RPC_RETVARS(c));
if (ret == -1) {	if (ret == -1) {
rpc_SetErr(EBADRPC, "Prepare RPC packet failed");	rpc_SetErr(EBADRPC, "Prepare RPC packet failed");
rpc->call_argc ^= rpc->call_argc;	rpc->call_argc ^= rpc->call_argc;
Line 1048 txEXTPacket(sched_task_t *task)	Line 1051 txEXTPacket(sched_task_t *task)
}	}
}	}

	/* Free return values */
	ait_freeVars(&RPC_RETVARS(c));

rpc->call_len = htonl(wlen);	rpc->call_len = htonl(wlen);
rpc->call_io = RPC_ACK;	rpc->call_io = RPC_ACK;

Line 1478 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)	Line 1484 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
srv->srv_blob.kill = 1;	srv->srv_blob.kill = 1;

schedEnd(&srv->srv_blob.root);	schedEnd(&srv->srv_blob.root);

	if (srv->srv_blob.server.cli_sa.sa.sa_family == AF_LOCAL)
	unlink(srv->srv_blob.server.cli_sa.sun.sun_path);
}	}

/*	/*
Line 1579 rpc_srv_initServer(u_char InstID, int concurentClients	Line 1588 rpc_srv_initServer(u_char InstID, int concurentClients
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 (!Port)	if (!Port && proto < SOCK_RAW)
Port = RPC_DEFPORT;	Port = RPC_DEFPORT;
if (!e_gethostbyname(csHost, Port, &sa))	if (!e_gethostbyname(csHost, Port, &sa))
return NULL;	return NULL;
Line 1700 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)	Line 1709 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
sleep(RPC_SCHED_POLLING);	sleep(RPC_SCHED_POLLING);

schedEnd(&(*psrv)->srv_root);	schedEnd(&(*psrv)->srv_root);

	if ((*psrv)->srv_server.cli_sa.sa.sa_family == AF_LOCAL)
	unlink((*psrv)->srv_server.cli_sa.sun.sun_path);

pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx);	pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx);
e_free(*psrv);	e_free(*psrv);

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

Removed from v.1.26.2.2
changed lines
	Added in v.1.26.2.5