[Linuxisns-commit] isnsNT/isnsclient/src portal.c,1.5,1.6

[Robert W. <wrw...@us...>]

Update of /cvsroot/linuxisns/isnsNT/isnsclient/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21394/src

Modified Files:
	portal.c 
Log Message:
Fix up Portal object and rework ESI processing

Index: portal.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/portal.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** portal.c	8 Dec 2006 20:05:49 -0000	1.5
--- portal.c	14 Dec 2006 23:04:47 -0000	1.6
***************
*** 71,80 ****
  
     /* Get Portal Type */
     portal_type = 0;
-    if (0 !=
-        GetInput (cmdLine, "Portal Type", "*0: UDP 1: TCP", sizeof (cmdLine)))
-    {
-       portal_type = atoi (cmdLine);
-    }
  
     /* Get Port */
--- 71,81 ----
  
     /* Get Portal Type */
+ //   portal_type = 0;
+ //   if (0 !=
+ //       GetInput (cmdLine, "Portal Type", "*0: UDP 1: TCP", sizeof (cmdLine)))
+ //   {
+ //      portal_type = atoi (cmdLine);
+ //   }
     portal_type = 0;
  
     /* Get Port */
***************
*** 85,88 ****
--- 86,90 ----
        port = atoi (cmdLine);
     }
+ printf("port:%i\n",port);
     ISNSAppendAttr (&cmd, ISNS_PORTAL_PORT, 4, NULL,
                     port | (portal_type == 0 ? 0x10000 : 0));
***************
*** 295,299 ****
  
  
!    while (GetInput (cmdLine, "Entity ID", "(none)", sizeof (cmdLine)))
     {
        memset (eid, 0, sizeof (eid));
--- 297,301 ----
  
  
!    if (0  != GetInput (cmdLine, "Entity ID", "(none)", sizeof (cmdLine)))
     {
        memset (eid, 0, sizeof (eid));
***************
*** 348,352 ****
     }
     ISNSAppendAttr (&cmd, ISNS_PORTAL_PORT, 4, NULL,
!                    port | (port_type == 1 ? 0 : 0x10000));
  
     /* Get an Portal Sym Name */
--- 350,354 ----
     }
     ISNSAppendAttr (&cmd, ISNS_PORTAL_PORT, 4, NULL,
!                  port | (port_type == 1 ? 0 : 0x10000));
  
     /* Get an Portal Sym Name */