[Olsr-cvs] olsrd-current/lib/tas/src http.c, 1.6, 1.7 http.h, 1.2, 1.3

[Bernd Petrovitsch]

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

Modified Files:
	http.c http.h 
Log Message:
- applied 115-olsrd-nameserviceparamfix.patch and
  116-olsrd-fix-pluginparam-addons.patch by Sven-Ola Tücke
  <(spam-protected)> fixing the compilation warning on 64bit.


Index: http.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/tas/src/http.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** http.h	2 Sep 2007 22:17:00 -0000	1.2
--- http.h	17 Sep 2007 21:57:06 -0000	1.3
***************
*** 41,44 ****
--- 41,46 ----
   */
  
+ #include "olsrd_plugin.h" /* union set_plugin_parameter_addon */
+ 
  #define CHUNK_SIZE 1024
  
***************
*** 118,133 ****
  extern void httpInit(void);
  
! extern int httpSetAddress(const char *addrStr, void *data, unsigned int addon);
! extern int httpSetPort(const char *portStr, void *data, unsigned int addon);
! extern int httpSetRootDir(const char *rootDir, void *data, unsigned int addon);
! extern int httpSetWorkDir(const char *workDir, void *data, unsigned int addon);
! extern int httpSetIndexFile(const char *indexFile, void *data, unsigned int addon);
! extern int httpSetUser(const char *user, void *data, unsigned int addon);
! extern int httpSetPassword(const char *password, void *data, unsigned int addon);
! extern int httpSetSessTime(const char *timeStr, void *data, unsigned int addon);
! extern int httpSetPubDir(const char *pref, void *data, unsigned int addon);
! extern int httpSetQuantum(const char *quantumStr, void *data, unsigned int addon);
! extern int httpSetMessTime(const char *timeStr, void *data, unsigned int addon);
! extern int httpSetMessLimit(const char *limitStr, void *data, unsigned int addon);
  
  extern int httpSetup(void);
--- 120,135 ----
  extern void httpInit(void);
  
! extern int httpSetAddress(const char *addrStr, void *data, set_plugin_parameter_addon addon);
! extern int httpSetPort(const char *portStr, void *data, set_plugin_parameter_addon addon);
! extern int httpSetRootDir(const char *rootDir, void *data, set_plugin_parameter_addon addon);
! extern int httpSetWorkDir(const char *workDir, void *data, set_plugin_parameter_addon addon);
! extern int httpSetIndexFile(const char *indexFile, void *data, set_plugin_parameter_addon addon);
! extern int httpSetUser(const char *user, void *data, set_plugin_parameter_addon addon);
! extern int httpSetPassword(const char *password, void *data, set_plugin_parameter_addon addon);
! extern int httpSetSessTime(const char *timeStr, void *data, set_plugin_parameter_addon addon);
! extern int httpSetPubDir(const char *pref, void *data, set_plugin_parameter_addon addon);
! extern int httpSetQuantum(const char *quantumStr, void *data, set_plugin_parameter_addon addon);
! extern int httpSetMessTime(const char *timeStr, void *data, set_plugin_parameter_addon addon);
! extern int httpSetMessLimit(const char *limitStr, void *data, set_plugin_parameter_addon addon);
  
  extern int httpSetup(void);

Index: http.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/tas/src/http.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** http.c	2 Sep 2007 22:17:00 -0000	1.6
--- http.c	17 Sep 2007 21:57:06 -0000	1.7
***************
*** 448,452 ****
  }
  
! int httpSetAddress(const char *addrStr, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    if (parseIpAddr(&confAddr, addrStr) < 0)
--- 448,452 ----
  }
  
! int httpSetAddress(const char *addrStr, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    if (parseIpAddr(&confAddr, addrStr) < 0)
***************
*** 459,463 ****
  }
  
! int httpSetPort(const char *portStr, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    unsigned int port;
--- 459,463 ----
  }
  
! int httpSetPort(const char *portStr, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    unsigned int port;
***************
*** 480,484 ****
  }
  
! int httpSetRootDir(const char *rootDir, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    if (checkAbsPath(rootDir) < 0)
--- 480,484 ----
  }
  
! int httpSetRootDir(const char *rootDir, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    if (checkAbsPath(rootDir) < 0)
***************
*** 492,496 ****
  }
  
! int httpSetWorkDir(const char *workDir, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    if (checkAbsPath(workDir) < 0)
--- 492,496 ----
  }
  
! int httpSetWorkDir(const char *workDir, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    if (checkAbsPath(workDir) < 0)
***************
*** 504,508 ****
  }
  
! int httpSetIndexFile(const char *indexFile, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    confIndexFile = myStrdup(indexFile);
--- 504,508 ----
  }
  
! int httpSetIndexFile(const char *indexFile, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    confIndexFile = myStrdup(indexFile);
***************
*** 510,514 ****
  }
  
! int httpSetUser(const char *user, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    confUser = myStrdup(user);
--- 510,514 ----
  }
  
! int httpSetUser(const char *user, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    confUser = myStrdup(user);
***************
*** 516,520 ****
  }
  
! int httpSetPassword(const char *password, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    confPassword = myStrdup(password);
--- 516,520 ----
  }
  
! int httpSetPassword(const char *password, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    confPassword = myStrdup(password);
***************
*** 522,526 ****
  }
  
! int httpSetSessTime(const char *timeStr, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    unsigned int time;
--- 522,526 ----
  }
  
! int httpSetSessTime(const char *timeStr, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    unsigned int time;
***************
*** 543,547 ****
  }
  
! int httpSetPubDir(const char *pubDir, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    confPubDir = myStrdup(pubDir);
--- 543,547 ----
  }
  
! int httpSetPubDir(const char *pubDir, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    confPubDir = myStrdup(pubDir);
***************
*** 549,553 ****
  }
  
! int httpSetQuantum(const char *quantumStr, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    unsigned int quantum;
--- 549,553 ----
  }
  
! int httpSetQuantum(const char *quantumStr, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    unsigned int quantum;
***************
*** 570,574 ****
  }
  
! int httpSetMessTime(const char *timeStr, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    unsigned int time;
--- 570,574 ----
  }
  
! int httpSetMessTime(const char *timeStr, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    unsigned int time;
***************
*** 591,595 ****
  }
  
! int httpSetMessLimit(const char *limitStr, void *data __attribute__((unused)), unsigned int addon __attribute__((unused)))
  {
    unsigned int limit;
--- 591,595 ----
  }
  
! int httpSetMessLimit(const char *limitStr, void *data __attribute__((unused)), set_plugin_parameter_addon addon __attribute__((unused)))
  {
    unsigned int limit;