[Olsr-cvs] olsrd-current/lib/httpinfo/src olsrd_httpinfo.h, 1.31, 1.32 olsrd_plugin.c, 1.17, 1.18

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/lib/httpinfo/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23008/lib/httpinfo/src

Modified Files:
	olsrd_httpinfo.h olsrd_plugin.c 
Log Message:
* Patch from Sven-Ola Tuecke to convert more plugins to the new interface.


Index: olsrd_httpinfo.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** olsrd_httpinfo.h	19 Aug 2007 23:00:22 -0000	1.31
--- olsrd_httpinfo.h	25 Aug 2007 19:48:42 -0000	1.32
***************
*** 82,86 ****
  void olsr_plugin_exit(void);
  void olsr_plugin_exit(void);
- void olsrd_get_plugin_parameters(const struct olsrd_plugin_parameters **params, int *size);
  
  #if 0
--- 82,85 ----

Index: olsrd_plugin.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_plugin.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** olsrd_plugin.c	15 Jul 2007 19:29:38 -0000	1.17
--- olsrd_plugin.c	25 Aug 2007 19:48:42 -0000	1.18
***************
*** 65,70 ****
  static void my_fini(void) __attribute__ ((destructor));
  
! static int add_plugin_ipnet(const char *value, void *data);
! static int add_plugin_ipaddr(const char *value, void *data);
  
  static int insert_plugin_ipnet(const char *sz_net, const char *sz_mask, struct allowed_net **allowed_nets);
--- 65,70 ----
  static void my_fini(void) __attribute__ ((destructor));
  
! static int add_plugin_ipnet(const char *value, void *data, unsigned int);
! static int add_plugin_ipaddr(const char *value, void *data, unsigned int);
  
  static int insert_plugin_ipnet(const char *sz_net, const char *sz_mask, struct allowed_net **allowed_nets);
***************
*** 141,147 ****
  }
  
! static int add_plugin_ipnet(const char *value, void *data)
  {
      char sz_net[100], sz_mask[100]; /* IPv6 in the future */
  
      if(sscanf(value, "%99s %99s", sz_net, sz_mask) != 2) {
--- 141,148 ----
  }
  
! static int add_plugin_ipnet(const char *value, void *data, unsigned int addon)
  {
      char sz_net[100], sz_mask[100]; /* IPv6 in the future */
+     if (addon) {}
  
      if(sscanf(value, "%99s %99s", sz_net, sz_mask) != 2) {
***************
*** 152,157 ****
  }
  
! static int add_plugin_ipaddr(const char *value, void *data)
  {
      return insert_plugin_ipnet(value, "255.255.255.255", data);
  }
--- 153,159 ----
  }
  
! static int add_plugin_ipaddr(const char *value, void *data, unsigned int addon)
  {
+     if (addon) {}
      return insert_plugin_ipnet(value, "255.255.255.255", data);
  }