[Olsr-cvs] olsrd-current/src defs.h, 1.49, 1.50 parser.c, 1.28, 1.29 print_packet.c, 1.7, 1.8

[Andreas T�nnesen]

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

Modified Files:
	defs.h parser.c print_packet.c 
Log Message:
x86_64 patch from Bernd

Index: parser.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/parser.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** parser.c	17 Nov 2005 01:58:52 -0000	1.28
--- parser.c	19 Nov 2005 08:49:44 -0000	1.29
***************
*** 344,348 ****
    /* sockaddr_in6 is bigger than sockaddr !!!! */
    struct sockaddr_storage from;
!   size_t fromlen;
    int cc;
    struct interface *olsr_in_if;
--- 344,348 ----
    /* sockaddr_in6 is bigger than sockaddr !!!! */
    struct sockaddr_storage from;
!   socklen_t fromlen;
    int cc;
    struct interface *olsr_in_if;
***************
*** 432,436 ****
    /* sockaddr_in6 is bigger than sockaddr !!!! */
    struct sockaddr_storage from;
!   size_t fromlen;
    int cc;
    struct interface *olsr_in_if;
--- 432,436 ----
    /* sockaddr_in6 is bigger than sockaddr !!!! */
    struct sockaddr_storage from;
!   socklen_t fromlen;
    int cc;
    struct interface *olsr_in_if;

Index: defs.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/defs.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** defs.h	29 May 2005 12:47:45 -0000	1.49
--- defs.h	19 Nov 2005 08:49:44 -0000	1.50
***************
*** 98,102 ****
     according to system ticks returned by times(2) */
  #define GET_TIMESTAMP(s1) \
!         now_times + ((s1) / system_tick_divider)
  
  #define TIMED_OUT(s1) \
--- 98,102 ----
     according to system ticks returned by times(2) */
  #define GET_TIMESTAMP(s1) \
!         (now_times + ((s1) / system_tick_divider))
  
  #define TIMED_OUT(s1) \

Index: print_packet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/print_packet.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** print_packet.c	28 May 2005 14:43:07 -0000	1.7
--- print_packet.c	19 Nov 2005 08:49:44 -0000	1.8
***************
*** 91,95 ****
        print_olsr_serialized_message(handle, msg);
        remainsize -= ntohs(msg->v4.olsr_msgsize);
!       msg = (union olsr_message *)((int)msg + (int)ntohs(msg->v4.olsr_msgsize));
      }
  
--- 91,95 ----
        print_olsr_serialized_message(handle, msg);
        remainsize -= ntohs(msg->v4.olsr_msgsize);
!       msg = (union olsr_message *)((char *)msg + ntohs(msg->v4.olsr_msgsize));
      }