[Olsr-cvs] olsrd-current/src/win32 apm.c, 1.10, 1.11 ifnet.c, 1.34, 1.35 kernel_routes.c, 1.18, 1.19 net.c, 1.20, 1.21

Thu Apr 26 00:08:20 CEST 2007

Update of /cvsroot/olsrd/olsrd-current/src/win32
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2640/src/win32

Modified Files:
	apm.c ifnet.c kernel_routes.c net.c 
Log Message:
* OLSR_PRINTF() is now a real C expression
* removed superflous type-casts

Index: ifnet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/win32/ifnet.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ifnet.c	29 Mar 2007 16:34:39 -0000	1.34
--- ifnet.c	25 Apr 2007 22:08:18 -0000	1.35
***************
*** 445,453 ****
      if (ErrNo == ERROR_GEN_FAILURE || ErrNo == ERROR_INVALID_PARAMETER)
      {
!       OLSR_PRINTF(5, "OID not supported. Device probably not wireless.\n")
        return 0;
      }

!     OLSR_PRINTF(5, "DeviceIoControl() = %08x, %s\n", ErrNo, StrError(ErrNo))
      return -1;
    }
--- 445,453 ----
      if (ErrNo == ERROR_GEN_FAILURE || ErrNo == ERROR_INVALID_PARAMETER)
      {
!       OLSR_PRINTF(5, "OID not supported. Device probably not wireless.\n");
        return 0;
      }

!     OLSR_PRINTF(5, "DeviceIoControl() = %08x, %s\n", ErrNo, StrError(ErrNo));
      return -1;
    }
***************
*** 491,495 ****
    for (Walker = AdInfo; Walker != NULL; Walker = Walker->Next)
    {
!     OLSR_PRINTF(5, "Index = %08x\n", (int)Walker->Index)

      MiniIndexToIntName(IntName, Walker->Index);
--- 491,495 ----
    for (Walker = AdInfo; Walker != NULL; Walker = Walker->Next)
    {
!     OLSR_PRINTF(5, "Index = %08x\n", (int)Walker->Index);

      MiniIndexToIntName(IntName, Walker->Index);
***************
*** 520,524 ****
    struct interface *Int, *Prev;

!   OLSR_PRINTF(1, "Removing interface %s.\n", IntConf->name)

    Int = IntConf->interf;
--- 520,524 ----
    struct interface *Int, *Prev;

!   OLSR_PRINTF(1, "Removing interface %s.\n", IntConf->name);

    Int = IntConf->interf;
***************
*** 541,545 ****
      {
        memset(&olsr_cnf->main_addr, 0, olsr_cnf->ipsize);
!       OLSR_PRINTF(1, "Removed last interface. Cleared main address.\n")
      }

--- 541,545 ----
      {
        memset(&olsr_cnf->main_addr, 0, olsr_cnf->ipsize);
!       OLSR_PRINTF(1, "Removed last interface. Cleared main address.\n");
      }

***************
*** 547,551 ****
      {
        COPY_IP(&olsr_cnf->main_addr, &ifnet->ip_addr);
!       OLSR_PRINTF(1, "New main address: %s.\n", olsr_ip_to_string(&olsr_cnf->main_addr))
      }
    }
--- 547,551 ----
      {
        COPY_IP(&olsr_cnf->main_addr, &ifnet->ip_addr);
!       OLSR_PRINTF(1, "New main address: %s.\n", olsr_ip_to_string(&olsr_cnf->main_addr));
      }
    }
***************
*** 594,598 ****
    if (ifnet == NULL && !olsr_cnf->allow_no_interfaces)
    {
!     OLSR_PRINTF(1, "No more active interfaces - exiting.\n")
      olsr_cnf->exit_value = EXIT_FAILURE;
      CallSignalHandler();
--- 594,598 ----
    if (ifnet == NULL && !olsr_cnf->allow_no_interfaces)
    {
!     OLSR_PRINTF(1, "No more active interfaces - exiting.\n");
      olsr_cnf->exit_value = EXIT_FAILURE;
      CallSignalHandler();
***************
*** 622,626 ****
    strcpy(ifp->int_name, "hcif01");

!   OLSR_PRINTF(1, "Adding %s(host emulation):\n", ifp->int_name)

    OLSR_PRINTF(1, "       Address:%s\n", olsr_ip_to_string(&iface->hemu_ip));
--- 622,626 ----
    strcpy(ifp->int_name, "hcif01");

!   OLSR_PRINTF(1, "Adding %s(host emulation):\n", ifp->int_name);

    OLSR_PRINTF(1, "       Address:%s\n", olsr_ip_to_string(&iface->hemu_ip));
***************
*** 637,641 ****
      {
        COPY_IP(&olsr_cnf->main_addr, &iface->hemu_ip);
!       OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&olsr_cnf->main_addr))
      }

--- 637,641 ----
      {
        COPY_IP(&olsr_cnf->main_addr, &iface->hemu_ip);
!       OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&olsr_cnf->main_addr));
      }

***************
*** 797,801 ****

  #ifdef DEBUG
!   OLSR_PRINTF(3, "Checking if %s is set down or changed\n", IntConf->name)
  #endif

--- 797,801 ----

  #ifdef DEBUG
!   OLSR_PRINTF(3, "Checking if %s is set down or changed\n", IntConf->name);
  #endif

***************
*** 817,821 ****
    if (Int->is_wireless != IsWlan)
    {
!     OLSR_PRINTF(1, "\tLAN/WLAN change: %d -> %d.\n", Int->is_wireless, IsWlan)

      Int->is_wireless = IsWlan;
--- 817,821 ----
    if (Int->is_wireless != IsWlan)
    {
!     OLSR_PRINTF(1, "\tLAN/WLAN change: %d -> %d.\n", Int->is_wireless, IsWlan);

      Int->is_wireless = IsWlan;
***************
*** 847,858 ****

  #ifdef DEBUG
!   OLSR_PRINTF(3, "\tAddress: %s\n", olsr_ip_to_string(&NewVal))
  #endif

    if (NewVal.v4 != OldVal.v4)
    {
!     OLSR_PRINTF(1, "\tAddress change.\n")
!     OLSR_PRINTF(1, "\tOld: %s\n", olsr_ip_to_string(&OldVal))
!     OLSR_PRINTF(1, "\tNew: %s\n", olsr_ip_to_string(&NewVal))

      Int->ip_addr.v4 = NewVal.v4;
--- 847,858 ----

  #ifdef DEBUG
!   OLSR_PRINTF(3, "\tAddress: %s\n", olsr_ip_to_string(&NewVal));
  #endif

    if (NewVal.v4 != OldVal.v4)
    {
!     OLSR_PRINTF(1, "\tAddress change.\n");
!     OLSR_PRINTF(1, "\tOld: %s\n", olsr_ip_to_string(&OldVal));
!     OLSR_PRINTF(1, "\tNew: %s\n", olsr_ip_to_string(&NewVal));

      Int->ip_addr.v4 = NewVal.v4;
***************
*** 866,870 ****
      if (olsr_cnf->main_addr.v4 == OldVal.v4)
      {
!       OLSR_PRINTF(1, "\tMain address change.\n")

        olsr_cnf->main_addr.v4 = NewVal.v4;
--- 866,870 ----
      if (olsr_cnf->main_addr.v4 == OldVal.v4)
      {
!       OLSR_PRINTF(1, "\tMain address change.\n");

        olsr_cnf->main_addr.v4 = NewVal.v4;
***************
*** 875,879 ****

    else
!     OLSR_PRINTF(3, "\tNo address change.\n")

    OldVal.v4 = ((struct sockaddr_in *)&Int->int_netmask)->sin_addr.s_addr;
--- 875,879 ----

    else
!     OLSR_PRINTF(3, "\tNo address change.\n");

    OldVal.v4 = ((struct sockaddr_in *)&Int->int_netmask)->sin_addr.s_addr;
***************
*** 881,892 ****

  #ifdef DEBUG
!   OLSR_PRINTF(3, "\tNetmask: %s\n", olsr_ip_to_string(&NewVal))
  #endif

    if (NewVal.v4 != OldVal.v4)
    {
!     OLSR_PRINTF(1, "\tNetmask change.\n")
!     OLSR_PRINTF(1, "\tOld: %s\n", olsr_ip_to_string(&OldVal))
!     OLSR_PRINTF(1, "\tNew: %s\n", olsr_ip_to_string(&NewVal))

      AddrIn = (struct sockaddr_in *)&Int->int_netmask;
--- 881,892 ----

  #ifdef DEBUG
!   OLSR_PRINTF(3, "\tNetmask: %s\n", olsr_ip_to_string(&NewVal));
  #endif

    if (NewVal.v4 != OldVal.v4)
    {
!     OLSR_PRINTF(1, "\tNetmask change.\n");
!     OLSR_PRINTF(1, "\tOld: %s\n", olsr_ip_to_string(&OldVal));
!     OLSR_PRINTF(1, "\tNew: %s\n", olsr_ip_to_string(&NewVal));

      AddrIn = (struct sockaddr_in *)&Int->int_netmask;
***************
*** 900,904 ****

    else
!     OLSR_PRINTF(3, "\tNo netmask change.\n")

    OldVal.v4 = ((struct sockaddr_in *)&Int->int_broadaddr)->sin_addr.s_addr;
--- 900,904 ----

    else
!     OLSR_PRINTF(3, "\tNo netmask change.\n");

    OldVal.v4 = ((struct sockaddr_in *)&Int->int_broadaddr)->sin_addr.s_addr;
***************
*** 906,917 ****

  #ifdef DEBUG
!   OLSR_PRINTF(3, "\tBroadcast address: %s\n", olsr_ip_to_string(&NewVal))
  #endif

    if (NewVal.v4 != OldVal.v4)
    {
!     OLSR_PRINTF(1, "\tBroadcast address change.\n")
!     OLSR_PRINTF(1, "\tOld: %s\n", olsr_ip_to_string(&OldVal))
!     OLSR_PRINTF(1, "\tNew: %s\n", olsr_ip_to_string(&NewVal))

      AddrIn = (struct sockaddr_in *)&Int->int_broadaddr;
--- 906,917 ----

  #ifdef DEBUG
!   OLSR_PRINTF(3, "\tBroadcast address: %s\n", olsr_ip_to_string(&NewVal));
  #endif

    if (NewVal.v4 != OldVal.v4)
    {
!     OLSR_PRINTF(1, "\tBroadcast address change.\n");
!     OLSR_PRINTF(1, "\tOld: %s\n", olsr_ip_to_string(&OldVal));
!     OLSR_PRINTF(1, "\tNew: %s\n", olsr_ip_to_string(&NewVal));

      AddrIn = (struct sockaddr_in *)&Int->int_broadaddr;
***************
*** 925,929 ****

    else
!     OLSR_PRINTF(3, "\tNo broadcast address change.\n")

    if (Res != 0)
--- 925,929 ----

    else
!     OLSR_PRINTF(3, "\tNo broadcast address change.\n");

    if (Res != 0)
***************
*** 1004,1014 ****

    OLSR_PRINTF(1, "\tInterface %s set up for use with index %d\n\n",
!               IntConf->name, New->if_nr)

!   OLSR_PRINTF(1, "\tMTU: %d\n", New->int_mtu)
!   OLSR_PRINTF(1, "\tAddress: %s\n", sockaddr_to_string(&New->int_addr))
!   OLSR_PRINTF(1, "\tNetmask: %s\n", sockaddr_to_string(&New->int_netmask))
    OLSR_PRINTF(1, "\tBroadcast address: %s\n",
!               sockaddr_to_string(&New->int_broadaddr))

    New->ip_addr.v4 =
--- 1004,1014 ----

    OLSR_PRINTF(1, "\tInterface %s set up for use with index %d\n\n",
!               IntConf->name, New->if_nr);

!   OLSR_PRINTF(1, "\tMTU: %d\n", New->int_mtu);
!   OLSR_PRINTF(1, "\tAddress: %s\n", sockaddr_to_string(&New->int_addr));
!   OLSR_PRINTF(1, "\tNetmask: %s\n", sockaddr_to_string(&New->int_netmask));
    OLSR_PRINTF(1, "\tBroadcast address: %s\n",
!               sockaddr_to_string(&New->int_broadaddr));

    New->ip_addr.v4 =
***************
*** 1017,1021 ****
    New->if_index = Info.Index;

!   OLSR_PRINTF(3, "\tKernel index: %08x\n", New->if_index)

    AddrSockAddr = addrsock.sin_addr.s_addr;
--- 1017,1021 ----
    New->if_index = Info.Index;

!   OLSR_PRINTF(3, "\tKernel index: %08x\n", New->if_index);

    AddrSockAddr = addrsock.sin_addr.s_addr;
***************
*** 1046,1050 ****
    {
      COPY_IP(&olsr_cnf->main_addr, &New->ip_addr);
!     OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&olsr_cnf->main_addr))
    }

--- 1046,1050 ----
    {
      COPY_IP(&olsr_cnf->main_addr, &New->ip_addr);
!     OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&olsr_cnf->main_addr));
    }

***************
*** 1105,1109 ****

  #ifdef DEBUG
!   OLSR_PRINTF(3, "Checking for updates in the interface set\n")
  #endif

--- 1105,1109 ----

  #ifdef DEBUG
!   OLSR_PRINTF(3, "Checking for updates in the interface set\n");
  #endif

Index: net.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/win32/net.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** net.c	5 Nov 2006 23:03:56 -0000	1.20
--- net.c	25 Apr 2007 22:08:18 -0000	1.21
***************
*** 229,233 ****
    }

!   OLSR_PRINTF(3, "Routing enabled.\n")

    return 0;
--- 229,233 ----
    }

!   OLSR_PRINTF(3, "Routing enabled.\n");

    return 0;
***************
*** 260,264 ****
    }

!   OLSR_PRINTF(3, "Routing disabled, count = %u.\n", Count)

    return 0;
--- 260,264 ----
    }

!   OLSR_PRINTF(3, "Routing disabled, count = %u.\n", Count);

    return 0;
***************
*** 344,348 ****
    McastReq.ipv6mr_interface = Nic->if_index;

!   OLSR_PRINTF(3, "Interface %s joining multicast %s...", Nic->int_name, olsr_ip_to_string((union olsr_ip_addr *)&Nic->int6_multaddr.sin6_addr))
    /* Send multicast */
    if(setsockopt(Sock, 
--- 344,348 ----
    McastReq.ipv6mr_interface = Nic->if_index;

!   OLSR_PRINTF(3, "Interface %s joining multicast %s...", Nic->int_name, olsr_ip_to_string((union olsr_ip_addr *)&Nic->int6_multaddr.sin6_addr));
    /* Send multicast */
    if(setsockopt(Sock, 
***************
*** 393,397 ****

!   OLSR_PRINTF(3, "OK\n")
    return 0;
  }
--- 393,397 ----

!   OLSR_PRINTF(3, "OK\n");
    return 0;
  }

Index: kernel_routes.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/win32/kernel_routes.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** kernel_routes.c	28 Mar 2007 12:07:05 -0000	1.18
--- kernel_routes.c	25 Apr 2007 22:08:18 -0000	1.19
***************
*** 64,68 ****

    OLSR_PRINTF(1, "Adding IPv4 route with metric %d to %s/%s via %s and I/F 0x%x.\n",
!               Dest->rt_metric + Dest->rt_if->int_metric, Str1, Str2, Str3, Dest->rt_if->if_index)

    memset(&Row, 0, sizeof (MIB_IPFORWARDROW));
--- 64,68 ----

    OLSR_PRINTF(1, "Adding IPv4 route with metric %d to %s/%s via %s and I/F 0x%x.\n",
!               Dest->rt_metric + Dest->rt_if->int_metric, Str1, Str2, Str3, Dest->rt_if->if_index);

    memset(&Row, 0, sizeof (MIB_IPFORWARDROW));
***************
*** 130,134 ****

    OLSR_PRINTF(1, "Deleting IPv4 route with metric %d to %s/%s via %s and I/F 0x%x.\n",
!               Dest->rt_metric + Dest->rt_if->int_metric, Str1, Str2, Str3, Dest->rt_if->if_index)

    memset(&Row, 0, sizeof (MIB_IPFORWARDROW));
--- 130,134 ----

    OLSR_PRINTF(1, "Deleting IPv4 route with metric %d to %s/%s via %s and I/F 0x%x.\n",
!               Dest->rt_metric + Dest->rt_if->int_metric, Str1, Str2, Str3, Dest->rt_if->if_index);

    memset(&Row, 0, sizeof (MIB_IPFORWARDROW));

Index: apm.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/win32/apm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** apm.c	21 Mar 2005 02:17:36 -0000	1.10
--- apm.c	25 Apr 2007 22:08:18 -0000	1.11
***************
*** 53,57 ****
    struct olsr_apm_info ApmInfo;

!   OLSR_PRINTF(3, "Initializing APM\n")

    if(apm_read(&ApmInfo) < 0)
--- 53,57 ----
    struct olsr_apm_info ApmInfo;

!   OLSR_PRINTF(3, "Initializing APM\n");

    if(apm_read(&ApmInfo) < 0)
***************
*** 67,71 ****
    OLSR_PRINTF(5, "APM info:\n\tAC status %d\n\tBattery percentage %d%%\n\n",
  	      ApmInfo->ac_line_status,
! 	      ApmInfo->battery_percentage)
  }

--- 67,71 ----
    OLSR_PRINTF(5, "APM info:\n\tAC status %d\n\tBattery percentage %d%%\n\n",
  	      ApmInfo->ac_line_status,
! 	      ApmInfo->battery_percentage);
  }