Commit b6da8c8f2fbdb627fedc60df3faa575d9cc3d825

Ilkka <ima @fla197…ptop.(none)>
Fri Jun 11 14:50:29 CEST 2010

Tree SHA1: b0780bd
Parent SHA1: 9460983 (l_up: Basic nodes request all cmaps (all IAs) from LManager. This way connecting BN knows where to forward Gateway-calls if LManager is local but Gateway is not.)
raw diff | raw patch

ld_tcp_ip: If node is Gateway, it will receive and forward scene requests as LManager does.

Diff rendering mode:
inline
side by side


245	245	int ret = -1;
246	246
247	247	/* if static ip is used print LMANAGER address */
248		if(NODE_IS_MANAGER(ld_tcp)) {
	248	if(NODE_IS_MANAGER(ld_tcp) \|\| NODE_IS_GATEWAY(ld_tcp)) {
249	249	/* check if static ip is used */
250	250	if((mgr_ip = get_manager_ip(&port)) != NULL) {
251		printf("LManager server at static address \"%s\" port (%u)\n", mgr_ip, port);
	251	if(NODE_IS_MANAGER(ld_tcp)) {
	252	printf("LManager server at static address \"%s\" port (%u)\n", mgr_ip, port);
	253	}
252	254	}
253	255
254	256	if(mgr_ip) {
…	…
266	266	LD_TRACEH("connection less server fd(%d) at address %s port (%d) \n", cl_sock->fd_server, mgr_ip, cl_sock->port_server);
267	267
268	268	/* if static ip is not used print LMANAGER address */
269		if(NODE_IS_MANAGER(ld_tcp) && !mgr_ip) {
	269	if((NODE_IS_MANAGER(ld_tcp) \|\| NODE_IS_GATEWAY(ld_tcp)) && !mgr_ip) {
270	270	int ret;
271	271	unsigned char address[4];
272	272	int* address_ptr = (int*)address;
…	…
368	368	status = LD_STATUS_NOK;
369	369	}
370	370	else {
371		if(NODE_IS_MANAGER(ld) && !get_manager_ip(&port)) {
	371	if((NODE_IS_MANAGER(ld) \|\| NODE_IS_GATEWAY(ld)) && !get_manager_ip(&port)) {
372	372	/* wait scene thread to run */
373	373	nota_semaphore_down(ld->scene_thread_sem);
374	374	}
…	…
422	422	nota_semaphore_down(ld->scene_thread_sem);
423	423
424	424	/* deactivate scene sockets */
425		if(NODE_IS_MANAGER(ld) && !get_manager_ip(&port)) {
	425	if((NODE_IS_MANAGER(ld) \|\| NODE_IS_GATEWAY(ld)) && !get_manager_ip(&port)) {
426	426	if(scene_sock->scene_server_fd >= 0) {
427	427	tcp_disconnect(scene_sock->scene_server_fd);
428	428	tcp_close(scene_sock->scene_server_fd);


422	422
423	423	ld->state \|= LD_STATE_SCENE_THREAD_RUNNING;
424	424
425		if(NODE_IS_MANAGER(ld)) {
	425	if(NODE_IS_MANAGER(ld) \|\| NODE_IS_GATEWAY(ld)) {
426	426	/* Lmanager enables the ld_tcp_ip_activate to continue */
427	427	nota_semaphore_up(ld->scene_thread_sem);
428	428	}
…	…
433	433
434	434	while(!(ld->state & LD_STATE_DESTROYING)) {
435	435	int ret = 0;
436		if(NODE_IS_MANAGER(ld)) {
	436	if(NODE_IS_MANAGER(ld) \|\| NODE_IS_GATEWAY(ld)) {
437	437
438
439	438	select_zero(ld->scene_thread_select, LD_SOCKET_UPDATE_RWE);
440	439
441	440	if(scene_sock->ucast_fd < 0) {
…	…
468	468	int flags = LD_SOCKET_UPDATE_NONE;
469	469
470	470	/* receive scene data only for LMANAGER */
471		if(NODE_IS_MANAGER(ld)) {
	471	if(NODE_IS_MANAGER(ld) \|\| NODE_IS_GATEWAY(ld)) {
472	472	if(scene_sock->bcast_fd >= 0) {
473	473	flags = select_is_set(ld->scene_thread_select, scene_sock->bcast_fd, LD_SOCKET_UPDATE_READ);
474	474	if(flags == LD_SOCKET_UPDATE_READ) {

Commit b6da8c8f2fbdb627fedc60df3faa575d9cc3d825

Gitorious