[Autosec-devel] sonar/plugins inp_rand.c,1.9,1.10 log_file.c,1.24,1.25 log_xml.c,1.9,1.10 network_icmp.c,1.42,1.43 rfc793.c,1.43,1.44

[red0x <re...@us...>]

Update of /cvsroot/autosec/sonar/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18810/plugins

Modified Files:
	inp_rand.c log_file.c log_xml.c network_icmp.c rfc793.c 
Log Message:
Removed old, manky plugin options parsing routines

Index: inp_rand.c
===================================================================
RCS file: /cvsroot/autosec/sonar/plugins/inp_rand.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** inp_rand.c	2 Mar 2004 02:32:55 -0000	1.9
--- inp_rand.c	8 Apr 2004 19:11:02 -0000	1.10
***************
*** 39,43 ****
  static int plugin_destroy(void);
  static int plugin_open(void *c_data, int i_data);
- static int plugin_args(char opt, char *optarg);
  static int plugin_close(void);
  static int plugin_next(char *hostname);
--- 39,42 ----
***************
*** 74,78 ****
          pthis.plugin_init = &plugin_init;
          pthis.plugin_destroy = &plugin_destroy;
-         pthis.plugin_args = &plugin_args;
          pthis.plugin_open = &plugin_open;
          pthis.plugin_close = &plugin_close;
--- 73,76 ----
***************
*** 109,114 ****
          pthis.plugin_next = NULL;
          pthis.plugin_sweep = NULL;
-         pthis.plugin_args = NULL;
-         pthis.plugin_sweep = NULL;
          pthis.plugin_output = NULL;
  	pthis.plugin_results = NULL;
--- 107,110 ----
***************
*** 138,146 ****
  }
  
- static int plugin_args(char opt, char *optarg)
- {
-         return PLUGIN_INVALIDO;
- }
- 
  static int plugin_close(void)
  {
--- 134,137 ----

Index: network_icmp.c
===================================================================
RCS file: /cvsroot/autosec/sonar/plugins/network_icmp.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** network_icmp.c	31 Mar 2004 08:53:47 -0000	1.42
--- network_icmp.c	8 Apr 2004 19:11:02 -0000	1.43
***************
*** 65,69 ****
  
  static int icmp_end(void);
- static int icmp_args(char opt, char *optarg);
  static int icmp_leadin(void *c_data, int i_data);
  static int icmp_close(void);
--- 65,68 ----
***************
*** 122,126 ****
          pthis.plugin_next = NULL;
          pthis.plugin_sweep = &icmp_sweep;
-         pthis.plugin_args = &icmp_args;
          pthis.plugin_sweep = &icmp_sweep;
          pthis.plugin_output = NULL;
--- 121,124 ----
***************
*** 168,173 ****
          pthis.plugin_next = NULL;
          pthis.plugin_sweep = NULL;
-         pthis.plugin_args = NULL;
-         pthis.plugin_sweep = NULL;
          pthis.plugin_output = NULL;
  	pthis.plugin_results = NULL;
--- 166,169 ----
***************
*** 182,197 ****
  }
  
- 
- /** @fn icmp_args(char opt, char *optarg)
-   * Plugin Argument handler
-   * @param opt Option char as passed from getopt
-   * @param optarg Option argument as passed from getopt
-   * @return PLUGIN_OK if that argument was handled, PLUGIN_ERROR otherwise
-   */
- static int icmp_args(char opt, char *optarg)
- {
-         return PLUGIN_INVALIDO;
- }
- 
  static void icmp_arg_parse(char *sArgs, int arglen)
  {
--- 178,181 ----

Index: log_file.c
===================================================================
RCS file: /cvsroot/autosec/sonar/plugins/log_file.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** log_file.c	31 Mar 2004 08:53:46 -0000	1.24
--- log_file.c	8 Apr 2004 19:11:02 -0000	1.25
***************
*** 37,41 ****
  
  static int plugin_destroy(void);
- static int plugin_args(char opt, char *optarg);
  static int plugin_open(void *c_data, int i_data);
  static int plugin_close(void);
--- 37,40 ----
***************
*** 81,85 ****
          pthis.plugin_init = &plugin_init;
          pthis.plugin_destroy = &plugin_destroy;
-         pthis.plugin_args = &plugin_args;
          pthis.plugin_open = &plugin_open;
          pthis.plugin_close = &plugin_close;
--- 80,83 ----
***************
*** 112,117 ****
          pthis.plugin_next = NULL;
          pthis.plugin_sweep = NULL;
-         pthis.plugin_args = NULL;
-         pthis.plugin_sweep = NULL;
          pthis.plugin_output = NULL;
  	pthis.plugin_results = NULL;
--- 110,113 ----
***************
*** 126,135 ****
  }
  
- static int plugin_args(char opt, char *optarg)
- {
- 
-         return PLUGIN_INVALIDO;
- }
- 
  static int plugin_open(void *c_data, int i_data)
  {
--- 122,125 ----

Index: rfc793.c
===================================================================
RCS file: /cvsroot/autosec/sonar/plugins/rfc793.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** rfc793.c	8 Apr 2004 08:29:41 -0000	1.43
--- rfc793.c	8 Apr 2004 19:11:02 -0000	1.44
***************
*** 82,87 ****
      /* this is assumed */
      mthis = (sonar_t *) in_data;
!     if(mthis->api < 5)
!         err_quit("Plugin API must be 5 or higher, update sonar");
  
      pthis.type = NETWORK_PLUGIN;
--- 82,87 ----
      /* this is assumed */
      mthis = (sonar_t *) in_data;
!     if(mthis->api < 6)
!         err_quit("Plugin API must be 6 or higher, update sonar");
  
      pthis.type = NETWORK_PLUGIN;
***************
*** 97,101 ****
      pthis.plugin_init = &plugin_init;
      pthis.plugin_destroy = &plugin_destroy;
-     pthis.plugin_args = NULL;
      pthis.plugin_open = &plugin_open;
      pthis.plugin_close = &plugin_close;
--- 97,100 ----
***************
*** 139,143 ****
      pthis.plugin_next = NULL;
      pthis.plugin_sweep = NULL;
-     pthis.plugin_args = NULL;
      pthis.plugin_sweep = NULL;
      pthis.plugin_output = NULL;
--- 138,141 ----

Index: log_xml.c
===================================================================
RCS file: /cvsroot/autosec/sonar/plugins/log_xml.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** log_xml.c	2 Mar 2004 02:34:35 -0000	1.9
--- log_xml.c	8 Apr 2004 19:11:02 -0000	1.10
***************
*** 40,44 ****
  
  static int plugin_destroy(void);
- static int plugin_args(char opt, char *optarg);
  static int plugin_open(void *c_data, int i_data);
  static int plugin_close(void);
--- 40,43 ----
***************
*** 81,85 ****
          pthis.plugin_init = &plugin_init;
          pthis.plugin_destroy = &plugin_destroy;
-         pthis.plugin_args = &plugin_args;
          pthis.plugin_open = &plugin_open;
          pthis.plugin_close = &plugin_close;
--- 80,83 ----
***************
*** 113,118 ****
          pthis.plugin_next = NULL;
          pthis.plugin_sweep = NULL;
-         pthis.plugin_args = NULL;
-         pthis.plugin_sweep = NULL;
          pthis.plugin_output = NULL;
  	pthis.plugin_results = NULL;
--- 111,114 ----
***************
*** 127,135 ****
  }
  
- static int plugin_args(char opt, char *optarg)
- {
-         return PLUGIN_INVALIDO;
- }
- 
  static int plugin_open(void *c_data, int i_data)
  {
--- 123,126 ----