[Olsr-cvs] olsrd-current/lib/bmf/src Address.c, 1.7, 1.8 Address.h, 1.6, 1.7 NetworkInterfaces.c, 1.9, 1.10 NetworkInterfaces.h, 1.6, 1.7

[Bernd Petrovitsch]

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

Modified Files:
	Address.c Address.h NetworkInterfaces.c NetworkInterfaces.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: Address.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/bmf/src/Address.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Address.c	11 Sep 2007 23:22:38 -0000	1.7
--- Address.c	17 Sep 2007 21:57:05 -0000	1.8
***************
*** 69,73 ****
   * Data Used  : none
   * ------------------------------------------------------------------------- */
! int DoLocalBroadcast(const char* enable, void* data __attribute__((unused)), unsigned int addon  __attribute__((unused)))
  {
    if (strcmp(enable, "yes") == 0)
--- 69,73 ----
   * Data Used  : none
   * ------------------------------------------------------------------------- */
! int DoLocalBroadcast(const char* enable, void* data __attribute__((unused)), set_plugin_parameter_addon addon  __attribute__((unused)))
  {
    if (strcmp(enable, "yes") == 0)

Index: Address.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/bmf/src/Address.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Address.h	11 Sep 2007 23:22:38 -0000	1.6
--- Address.h	17 Sep 2007 21:57:05 -0000	1.7
***************
*** 42,45 ****
--- 42,46 ----
  
  #include "olsr_types.h" /* olsr_ip_addr */
+ #include "olsrd_plugin.h" /* union set_plugin_parameter_addon */
  #include "interfaces.h" /* struct interface */
  
***************
*** 48,52 ****
  extern int EnableLocalBroadcast;
  
! int DoLocalBroadcast(const char* enable, void* data, unsigned int addon);
  int IsMulticast(union olsr_ip_addr* ipAddress);
  int IsOlsrOrBmfPacket(unsigned char* ipPacket);
--- 49,53 ----
  extern int EnableLocalBroadcast;
  
! int DoLocalBroadcast(const char* enable, void* data, set_plugin_parameter_addon addon);
  int IsMulticast(union olsr_ip_addr* ipAddress);
  int IsOlsrOrBmfPacket(unsigned char* ipPacket);

Index: NetworkInterfaces.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/bmf/src/NetworkInterfaces.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NetworkInterfaces.c	13 Sep 2007 15:31:58 -0000	1.9
--- NetworkInterfaces.c	17 Sep 2007 21:57:05 -0000	1.10
***************
*** 128,132 ****
   * Data Used  : EtherTunTapIfName
   * ------------------------------------------------------------------------- */
! int SetBmfInterfaceName(const char* ifname, void* data __attribute__((unused)), unsigned int addon  __attribute__((unused)))
  {
    strncpy(EtherTunTapIfName, ifname, IFNAMSIZ - 1);
--- 128,132 ----
   * Data Used  : EtherTunTapIfName
   * ------------------------------------------------------------------------- */
! int SetBmfInterfaceName(const char* ifname, void* data __attribute__((unused)), set_plugin_parameter_addon addon  __attribute__((unused)))
  {
    strncpy(EtherTunTapIfName, ifname, IFNAMSIZ - 1);
***************
*** 147,151 ****
   *              TunTapIpOverruled
   * ------------------------------------------------------------------------- */
! int SetBmfInterfaceIp(const char* ip, void* data __attribute__((unused)), unsigned int addon  __attribute__((unused)))
  {
  #define IPV4_MAX_ADDRLEN 16
--- 147,151 ----
   *              TunTapIpOverruled
   * ------------------------------------------------------------------------- */
! int SetBmfInterfaceIp(const char* ip, void* data __attribute__((unused)), set_plugin_parameter_addon addon  __attribute__((unused)))
  {
  #define IPV4_MAX_ADDRLEN 16
***************
*** 217,221 ****
   * Data Used  : none
   * ------------------------------------------------------------------------- */
! int SetCapturePacketsOnOlsrInterfaces(const char* enable, void* data __attribute__((unused)), unsigned int addon  __attribute__((unused)))
  {
    if (strcmp(enable, "yes") == 0)
--- 217,221 ----
   * Data Used  : none
   * ------------------------------------------------------------------------- */
! int SetCapturePacketsOnOlsrInterfaces(const char* enable, void* data __attribute__((unused)), set_plugin_parameter_addon addon  __attribute__((unused)))
  {
    if (strcmp(enable, "yes") == 0)
***************
*** 245,249 ****
   * Data Used  : none
   * ------------------------------------------------------------------------- */
! int SetBmfMechanism(const char* mechanism, void* data __attribute__((unused)), unsigned int addon  __attribute__((unused)))
  {
    if (strcmp(mechanism, "Broadcast") == 0)
--- 245,249 ----
   * Data Used  : none
   * ------------------------------------------------------------------------- */
! int SetBmfMechanism(const char* mechanism, void* data __attribute__((unused)), set_plugin_parameter_addon addon  __attribute__((unused)))
  {
    if (strcmp(mechanism, "Broadcast") == 0)
***************
*** 1770,1774 ****
   * Data Used  : NonOlsrIfNames
   * ------------------------------------------------------------------------- */
! int AddNonOlsrBmfIf(const char* ifName, void* data __attribute__((unused)), unsigned int addon  __attribute__((unused)))
  {
    assert(ifName != NULL);
--- 1770,1774 ----
   * Data Used  : NonOlsrIfNames
   * ------------------------------------------------------------------------- */
! int AddNonOlsrBmfIf(const char* ifName, void* data __attribute__((unused)), set_plugin_parameter_addon addon  __attribute__((unused)))
  {
    assert(ifName != NULL);

Index: NetworkInterfaces.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/bmf/src/NetworkInterfaces.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NetworkInterfaces.h	11 Sep 2007 23:22:38 -0000	1.6
--- NetworkInterfaces.h	17 Sep 2007 21:57:05 -0000	1.7
***************
*** 46,49 ****
--- 46,50 ----
  /* OLSR includes */
  #include "olsr_types.h" /* olsr_ip_addr */
+ #include "olsrd_plugin.h" /* union set_plugin_parameter_addon */
  
  /* Plugin includes */
***************
*** 121,128 ****
  extern enum TBmfMechanism BmfMechanism;
  
! int SetBmfInterfaceName(const char* ifname, void* data, unsigned int addon);
! int SetBmfInterfaceIp(const char* ip, void* data, unsigned int addon);
! int SetCapturePacketsOnOlsrInterfaces(const char* enable, void* data, unsigned int addon);
! int SetBmfMechanism(const char* mechanism, void* data, unsigned int addon);
  int DeactivateSpoofFilter(void);
  void RestoreSpoofFilter(void);
--- 122,129 ----
  extern enum TBmfMechanism BmfMechanism;
  
! int SetBmfInterfaceName(const char* ifname, void* data, set_plugin_parameter_addon addon);
! int SetBmfInterfaceIp(const char* ip, void* data, set_plugin_parameter_addon addon);
! int SetCapturePacketsOnOlsrInterfaces(const char* enable, void* data, set_plugin_parameter_addon addon);
! int SetBmfMechanism(const char* mechanism, void* data, set_plugin_parameter_addon addon);
  int DeactivateSpoofFilter(void);
  void RestoreSpoofFilter(void);
***************
*** 144,148 ****
  void AddInterface(struct interface* newIntf);
  void CloseBmfNetworkInterfaces(void);
! int AddNonOlsrBmfIf(const char* ifName, void* data, unsigned int addon);
  int IsNonOlsrBmfIf(const char* ifName);
  void CheckAndUpdateLocalBroadcast(unsigned char* ipPacket, union olsr_ip_addr* broadAddr);
--- 145,149 ----
  void AddInterface(struct interface* newIntf);
  void CloseBmfNetworkInterfaces(void);
! int AddNonOlsrBmfIf(const char* ifName, void* data, set_plugin_parameter_addon addon);
  int IsNonOlsrBmfIf(const char* ifName);
  void CheckAndUpdateLocalBroadcast(unsigned char* ipPacket, union olsr_ip_addr* broadAddr);