[Olsr-cvs] olsrd-current/src/win32 ifnet.c,1.28,1.29

[Thomas Lopatic]

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

Modified Files:
	ifnet.c 
Log Message:
olsr_switch looks okay on Windows. Windows port uses correct MTU. With LQ
enabled minimal HELLO-validity-time is HELLO-interval x LQ-Window-Size.


Index: ifnet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/win32/ifnet.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ifnet.c	4 Aug 2005 20:45:29 -0000	1.28
--- ifnet.c	23 Oct 2005 19:01:04 -0000	1.29
***************
*** 184,187 ****
--- 184,190 ----
    Info->Mtu = (int)IfTable->table[TabIdx].dwMtu;
  
+   Info->Mtu -= (olsr_cnf->ip_version == AF_INET6) ?
+     UDP_IPV6_HDRSIZE : UDP_IPV4_HDRSIZE;
+ 
    BuffLen = sizeof (AdInfo);
  
***************
*** 483,487 ****
    ifp->int_mtu = OLSR_DEFAULT_MTU;
  
!   ifp->int_mtu -= (olsr_cnf->ip_version == AF_INET6) ? UDP_IPV6_HDRSIZE : UDP_IPV4_HDRSIZE;
  
    /* Set up buffer */
--- 486,491 ----
    ifp->int_mtu = OLSR_DEFAULT_MTU;
  
!   ifp->int_mtu -= (olsr_cnf->ip_version == AF_INET6) ?
!     UDP_IPV6_HDRSIZE : UDP_IPV4_HDRSIZE;
  
    /* Set up buffer */
***************
*** 551,555 ****
    addr[3] = htonl(addr[3]);
  
!   if(send(ifp->olsr_socket, addr , ipsize, 0) != (int)ipsize)
      {
        fprintf(stderr, "Error sending IP!");
--- 555,559 ----
    addr[3] = htonl(addr[3]);
  
!   if(send(ifp->olsr_socket, (char *)addr, ipsize, 0) != (int)ipsize)
      {
        fprintf(stderr, "Error sending IP!");