[Linuxisns-commit] isnsNT/isnsclient/src main_ui.c, NONE, 1.1 comm.c, 1.5, 1.6 main.c, 1.3, 1.4 uti

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	comm.c main.c util.c 
Added Files:
	main_ui.c 
Log Message:
add a command line version

--- NEW FILE: main_ui.c ---
/***********************************************************************
 Copyright (c) 2001, Nishan Systems, Inc.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without 
 modification, are permitted provided that the following conditions are 
 met:

 - Redistributions of source code must retain the above copyright notice, 
   this list of conditions and the following disclaimer. 

 - Redistributions in binary form must reproduce the above copyright 
   notice, this list of conditions and the following disclaimer in the 
   documentation and/or other materials provided with the distribution. 

 - Neither the name of the Nishan Systems, Inc. nor the names of its 
   contributors may be used to endorse or promote products derived from 
   this software without specific prior written permission. 

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
 IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A 
 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NISHAN SYSTEMS, INC. 
 OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
 OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

***********************************************************************/

#ifdef SNS_LINUX
#include <pthread.h>
#else
#include "getarg.h"
#endif

#include "isns.h"
#include "iscsi.h"
#include "portal.h"
#include "entity.h"
#include "ifcp.h"
#include "fcnode.h"
#include "util.h"
#include "comm.h"
#include "menu.h"

/***************************************
 Globals
 **************************************/
char p_ip[256];
extern int isns_port;
extern int enableESIFlag;
extern char multicast_addr[20];

/********************************
 Locals
********************************/
static char query[100]="";
static char reg[100]="";
static char dereg[100]="";
static char idvalue[100]="";
static char idvaluemember[256]="";

/*****************
   Usage Message
*****************/
char Usage[] = "\
Usage: isnsclient [options] \n\
Options:\n\
 -h               Listen for L2 heartbeat from an iSNS.\n\
 -a ip            iSNS Address.\n\
 -t               TCP mode.\n\
 -p port          Port used for sending. Default is port 3205.\n\
 -?               Help.\n\
\n\
";

/***********************************************************************/
int
main (int argc, char **argv)
{
   int l3_hb_flag;
   int hb_flag;
   int c;
   int tcpFlag;
   memset (p_ip, 0, sizeof (p_ip));

   printf ("IETF iSNS Open Source Client, v%s.\n", ISNS_VERSION);

   if (argc < 1)
   {
      fprintf (stderr, Usage);
      exit (0);
   }

   /* init ESI */
   InitESITable ();

   /* Default Values */
   isns_port = ISNS_SERVER_PORT;
   tcpFlag = FALSE;
   enableESIFlag = TRUE;
   hb_flag = FALSE;
   l3_hb_flag = FALSE;

   /* Parse Command Line arguments */
   while (optind != argc)
   {
      c = getopt (argc, argv, "htd:p:a:m:q:r:n:e:");

      switch (c)
      {
      case EOF:
         optarg = argv[optind];
         optind++;
         break;
      case 't':
         tcpFlag = TRUE;
         break;

      case 'p':
         isns_port = atoi (optarg);
         break;

      case 'a':
         strcpy (p_ip, optarg);
         break;

      case 'h':
         hb_flag=TRUE;
         break;

      case 'c':
         l3_hb_flag=TRUE;
         strcpy (multicast_addr, optarg);
         break;

      case 'q':
	 strcpy (query, optarg);
	 break;

      case 'r':
	 strcpy (reg, optarg);
	 break;

      case 'd':
	 strcpy (dereg, optarg);
	 break;

      case 'n':
	 strcpy (idvalue, optarg);
	 break;

      case 'm':
	 strcpy (idvaluemember, optarg);
	 break;

      case '?':
      default:
         fprintf (stderr, Usage);
         exit (0);
      }
   }

   if (0 == strlen (p_ip) && hb_flag==FALSE && l3_hb_flag==FALSE)
   {
      /* Error case: No IP */
      fprintf (stderr, Usage);
      exit (0);
   }

   /* Init the Communications sockets */
   if (-1==InitComm(hb_flag, l3_hb_flag, tcpFlag))
      exit(-1);

   Interact ();

   return (0);
}

Index: util.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** util.c	8 Dec 2006 20:05:49 -0000	1.4
--- util.c	2 Feb 2007 23:21:38 -0000	1.5
***************
*** 40,44 ****

  int hexDumpFlag;
! int parserFlag=TRUE;

  /***************************************************
--- 40,44 ----

  int hexDumpFlag;
! int parserFlag=FALSE;

  /***************************************************

Index: main.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.c	22 Nov 2006 21:01:52 -0000	1.3
--- main.c	2 Feb 2007 23:21:38 -0000	1.4
***************
*** 31,35 ****

  ***********************************************************************/
- /* -bli0 -i3 -ts3 -nut*/

  #ifdef SNS_LINUX
--- 31,34 ----
***************
*** 39,45 ****
  #endif

- 
  #include "isns.h"
- 
  #include "iscsi.h"
  #include "portal.h"
--- 38,42 ----
***************
*** 51,62 ****
  #include "menu.h"

  /***************************************
   Globals
   **************************************/
- int debugFlag = FALSE;
  char p_ip[256];
- 
- /********************************
- ********************************/
  extern int isns_port;
  extern int enableESIFlag;
--- 48,57 ----
  #include "menu.h"

+ extern void CommandLineDispatch (char , char *, char *, char *,char *);
+ 
  /***************************************
   Globals
   **************************************/
  char p_ip[256];
  extern int isns_port;
  extern int enableESIFlag;
***************
*** 64,69 ****

  /********************************
  ********************************/
! 

  /*****************
--- 59,70 ----

  /********************************
+  Locals
  ********************************/
! static char query[100]="";
! static char reg[100]="";
! static char dereg[100]="";
! static char idvalue[100]="";
! static char idvaluemember[256]="";
! static char id3[256]="";

  /*****************
***************
*** 73,86 ****
  Usage: isnsc [options] \n\
  Options:\n\
!     [-h]          Listen for L2 heartbeat from an iSNS.\n\
!     [-a ip]       iSNS Address.\n\
!     [-t]          TCP mode.\n\
!     [-p port]     Port used for sending. Default is port 3205.\n\
!     [-?]          Help.\n\
  \n\
  ";
- #if 0
-     [-m grp]      Listens for L3 heartbeat.
- #endif

  /***********************************************************************/
--- 74,108 ----
  Usage: isnsc [options] \n\
  Options:\n\
!  -h               Listen for L2 heartbeat from an iSNS.\n\
!  -a ip            iSNS Address.\n\
!  -t               TCP mode.\n\
!  -p port          Port used for sending. Default is port 3205.\n\
!  -?               Help.\n\
!  -q type          Query\n\
!                       type: dds\n\
!                       type: dd\n\
!                       type: iscsi\n\
!                       type: entity\n\
!                       type: portal\n\
!  -r type -n name -m member -v portvalue \n\
!                   Register\n\
!                       type:dds        name:id\n\
!                       type:dd         name:id\n\
!                       type:ddsmember  name:ddsid member:ddid\n\
!                       type:ddmember   name:ddid  member:iscsinode\n\
!                       type:entity     name:id\n\
!                       type:iscsi      name:iqnvalue member:entityid\n\
!                       type:portal     name:ipvalue  member:entityid -v port\n\
!  -d type -n name -m member\n\
!                   Deregister\n\
!                       type:dds        name=index\n\
!                       type:dd         name=index\n\
!                       type:ddsmember  name=ddsid  member:ddid\n\
!                       type:ddmember   name:ddid   member:iscsinode\n\
!                       type:entity     name:id\n\
!                       type:iscsi      name:iqnvalue\n\
!                       type:portal     name:ipvalue member:port\n\
  \n\
  ";

  /***********************************************************************/
***************
*** 115,119 ****
     while (optind != argc)
     {
!       c = getopt (argc, argv, "htd:p:a:m:");

        switch (c)
--- 137,141 ----
     while (optind != argc)
     {
!       c = getopt (argc, argv, "htd:p:a:m:q:r:n:e:v:");

        switch (c)
***************
*** 131,138 ****
           break;

-       case 'd':
-          debugFlag = TRUE;
-          break;
- 
        case 'a':
           strcpy (p_ip, optarg);
--- 153,156 ----
***************
*** 143,151 ****
           break;

!       case 'm':
           l3_hb_flag=TRUE;
           strcpy (multicast_addr, optarg);
           break;

        case '?':
        default:
--- 161,193 ----
           break;

!       case 'c':
           l3_hb_flag=TRUE;
           strcpy (multicast_addr, optarg);
           break;

+       case 'q':
+ 	 strcpy (query, optarg);
+ 	 break;
+ 
+       case 'r':
+ 	 strcpy (reg, optarg);
+ 	 break;
+ 
+       case 'd':
+ 	 strcpy (dereg, optarg);
+ 	 break;
+ 
+       case 'n':
+ 	 strcpy (idvalue, optarg);
+ 	 break;
+ 
+       case 'm':
+ 	 strcpy (idvaluemember, optarg);
+ 	 break;
+ 
+       case 'v':
+ 	 strcpy (id3, optarg);
+ 	 break;
+ 
        case '?':
        default:
***************
*** 157,161 ****
     if (0 == strlen (p_ip) && hb_flag==FALSE && l3_hb_flag==FALSE)
     {
-       /* Error case: No IP */
        fprintf (stderr, Usage);
        exit (0);
--- 199,202 ----
***************
*** 166,177 ****
        exit(-1);

!    printf ("Using iSNS IP: %s.\n", p_ip);
! 
!    Interact ();
!    /* We Should never return. */

- #ifndef SNS_LINUX
-    WSACleanup ();
- #endif
     return (0);
  }
--- 207,227 ----
        exit(-1);

!    if (strcmp(query,""))
!       CommandLineDispatch ('q',query,idvalue,idvaluemember,id3);
!    else if (strcmp(reg,""))
!    {
!       if ( 0 == strlen(idvalue))
!         printf ("-n parameter required\n");
!       else
!         CommandLineDispatch ('r',reg,idvalue,idvaluemember,id3);
!    }
!    else if (strcmp(dereg,""))
!    {
!       if ( 0 == strlen(idvalue))
!         printf ("-n parameter required\n");
!       else
!         CommandLineDispatch ('d',dereg,idvalue,idvaluemember,id3);
!    }

     return (0);
  }

Index: comm.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/comm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** comm.c	12 Dec 2006 22:14:31 -0000	1.5
--- comm.c	2 Feb 2007 23:21:38 -0000	1.6
***************
*** 65,69 ****
  int isns_port; /* iSNS port */

! 
  extern char *optarg;
  extern int enableESIFlag;
--- 65,69 ----
  int isns_port; /* iSNS port */

! extern int parserFlag;
  extern char *optarg;
  extern int enableESIFlag;
***************
*** 203,207 ****
     cmd->hdr.len = htons (cmd->hdr.len);
     e = SendPDU (cmd, len);
!    printf("PDU sent-->\n");
     DumpHex (cmd, e);
     if (e < 0)
--- 203,209 ----
     cmd->hdr.len = htons (cmd->hdr.len);
     e = SendPDU (cmd, len);
! 
!    if (parserFlag)
!       printf("PDU sent-->\n");
     DumpHex (cmd, e);
     if (e < 0)
***************
*** 307,311 ****
        return (e);
     }
!    printf("PDU sent-->\n");
     DumpHex (cmd, len);
     len = sizeof (their_addr);
--- 309,315 ----
        return (e);
     }
!    if (parserFlag)
!      printf("PDU sent-->\n");
! 
     DumpHex (cmd, len);
     len = sizeof (their_addr);
***************
*** 315,319 ****
        printf ("Error Receiving.\n");
     }
!    printf("PDU rcv-->\n");
     DumpHex (buffer, e);

--- 319,326 ----
        printf ("Error Receiving.\n");
     }
!    
!    if (parserFlag)
!       printf("PDU rcv-->\n");
! 
     DumpHex (buffer, e);

***************
*** 360,364 ****
        printf ("Error Sending.\n");
     }
!    printf("PDU sent-->\n");
     DumpHex (cmd, len);
     len = sizeof (their_addr);
--- 367,373 ----
        printf ("Error Sending.\n");
     }
! 
!    if (parserFlag)
!       printf("PDU sent-->\n");
     DumpHex (cmd, len);
     len = sizeof (their_addr);
***************
*** 369,373 ****
        printf ("Error Receiving.\n");
     }
!    printf("PDU rcv-->\n");
     DumpHex (rcvBuffer, e);

--- 378,385 ----
        printf ("Error Receiving.\n");
     }
! 
!    if (parserFlag)
!       printf("PDU rcv-->\n");
! 
     DumpHex (rcvBuffer, e);

[Linuxisns-commit] isnsNT/isnsclient/src main_ui.c, NONE, 1.1 comm.c, 1.5, 1.6 main.c, 1.3, 1.4 uti

[Linuxisns-commit] isnsNT/isnsclient/src main_ui.c, NONE, 1.1 comm.c, 1.5, 1.6 main.c, 1.3, 1.4 util.c, 1.4, 1.5