[Spread-cvs] commit: r584 - trunk/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2013-08-08 10:30:43 -0400 (Thu, 08 Aug 2013)
New Revision: 584

Modified:
   trunk/daemon/configuration.c
   trunk/daemon/configuration.h
   trunk/daemon/session.c
Log:
Attempt to change daemon to use int16u properly for all ports.


Modified: trunk/daemon/configuration.c
===================================================================
--- trunk/daemon/configuration.c	2013-07-22 15:22:07 UTC (rev 583)
+++ trunk/daemon/configuration.c	2013-08-08 14:30:43 UTC (rev 584)
@@ -486,7 +486,7 @@
 	}
 
 	Conf_id_to_str( My.id, ip );
-	Alarm( CONF_SYS, "Conf_load_conf_file: My name: %s, id: %s, port: %hd\n",
+	Alarm( CONF_SYS, "Conf_load_conf_file: My name: %s, id: %s, port: %hu\n",
 		My.name, ip, My.port );
 
 	return;
@@ -757,7 +757,7 @@
 	for ( s=0; s < config->num_segments; s++ )
 	{
 		Conf_id_to_str( config->segments[s].bcast_address, ip );
-		Alarm( PRINT, "\t%d\t%-16s  %hd\n",
+		Alarm( PRINT, "\t%d\t%-16s  %hu\n",
 			config->segments[s].num_procs, ip,
 			config->segments[s].port );
 		for( p=0; p < config->segments[s].num_procs; p++)

Modified: trunk/daemon/configuration.h
===================================================================
--- trunk/daemon/configuration.h	2013-07-22 15:22:07 UTC (rev 583)
+++ trunk/daemon/configuration.h	2013-08-08 14:30:43 UTC (rev 584)
@@ -57,12 +57,12 @@
 
 struct spread_if_info {
         int32u  ip;
-        int16   port;
+        int16u  port;
         int16   type;
 };
 typedef struct dummy_proc{
 	char	name[MAX_PROC_NAME]; 
-	int16	port;
+	int16u	port;
 	int16	seg_index;
 	int16	index_in_seg;
 	int32u	id;
@@ -72,7 +72,7 @@
 
 typedef struct dummy_segment{
 	int32 	bcast_address;
-	int16	port;
+	int16u	port;
 	int	num_procs;
 	proc    *procs[MAX_PROCS_SEGMENT];
 } segment;

Modified: trunk/daemon/session.c
===================================================================
--- trunk/daemon/session.c	2013-07-22 15:22:07 UTC (rev 583)
+++ trunk/daemon/session.c	2013-08-08 14:30:43 UTC (rev 584)
@@ -408,7 +408,7 @@
 	    Alarm( EXIT, "Sess_init: UNIX sock error\n" );
 
 	unix_addr.sun_family	= AF_UNIX;
-	snprintf( name, sizeof(name), "%s/%d", SP_UNIX_SOCKET, My.port );
+	snprintf( name, sizeof(name), "%s/%hu", SP_UNIX_SOCKET, My.port );
 	strcpy( unix_addr.sun_path, name ); 
 	unlink( name );