[Olsr-cvs] olsrd-current/src olsr_protocol.h,1.18,1.19

[Andreas T�nnesen]

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

Modified Files:
	olsr_protocol.h 
Log Message:
Added pack attribute to data structures based on feedback from XScale BE users

Index: olsr_protocol.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_protocol.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** olsr_protocol.h	26 May 2005 11:11:10 -0000	1.18
--- olsr_protocol.h	11 Oct 2005 14:55:55 -0000	1.19
***************
*** 214,218 ****
    olsr_u16_t  size;
    olsr_u32_t  neigh_addr[1]; /* neighbor IP address(es) */
! };
  
  struct hellomsg 
--- 214,218 ----
    olsr_u16_t  size;
    olsr_u32_t  neigh_addr[1]; /* neighbor IP address(es) */
! } __attribute__ ((packed));
  
  struct hellomsg 
***************
*** 222,226 ****
    olsr_u8_t       willingness;
    struct hellinfo hell_info[1];
! };
  
  /*
--- 222,226 ----
    olsr_u8_t       willingness;
    struct hellinfo hell_info[1];
! } __attribute__ ((packed));
  
  /*
***************
*** 234,238 ****
    olsr_u16_t      size;
    struct in6_addr neigh_addr[1]; /* neighbor IP address(es) */
! };
  
  struct hellomsg6
--- 234,238 ----
    olsr_u16_t      size;
    struct in6_addr neigh_addr[1]; /* neighbor IP address(es) */
! } __attribute__ ((packed));
  
  struct hellomsg6
***************
*** 242,246 ****
    olsr_u8_t          willingness;
    struct hellinfo6   hell_info[1];
! };
  
  /*
--- 242,246 ----
    olsr_u8_t          willingness;
    struct hellinfo6   hell_info[1];
! } __attribute__ ((packed));
  
  /*
***************
*** 251,255 ****
  {
    olsr_u32_t       addr;
! };
  
  
--- 251,255 ----
  {
    olsr_u32_t       addr;
! } __attribute__ ((packed));
  
  
***************
*** 259,263 ****
    olsr_u16_t        reserved;
    struct neigh_info neigh[1];
! };
  
  
--- 259,263 ----
    olsr_u16_t        reserved;
    struct neigh_info neigh[1];
! } __attribute__ ((packed));
  
  
***************
*** 270,274 ****
  {
    struct in6_addr      addr;
! };
  
  
--- 270,274 ----
  {
    struct in6_addr      addr;
! } __attribute__ ((packed));
  
  
***************
*** 278,282 ****
    olsr_u16_t           reserved;
    struct neigh_info6   neigh[1];
! };
  
  
--- 278,282 ----
    olsr_u16_t           reserved;
    struct neigh_info6   neigh[1];
! } __attribute__ ((packed));
  
  
***************
*** 296,300 ****
  {
    olsr_u32_t addr;
! };
  
  
--- 296,300 ----
  {
    olsr_u32_t addr;
! } __attribute__ ((packed));
  
  
***************
*** 302,306 ****
  {
    struct midaddr mid_addr[1];
! };
  
  
--- 302,306 ----
  {
    struct midaddr mid_addr[1];
! } __attribute__ ((packed));
  
  
***************
*** 311,315 ****
  {
    struct in6_addr addr;
! };
  
  
--- 311,315 ----
  {
    struct in6_addr addr;
! } __attribute__ ((packed));
  
  
***************
*** 317,321 ****
  {
    struct midaddr6 mid_addr[1];
! };
  
  
--- 317,321 ----
  {
    struct midaddr6 mid_addr[1];
! } __attribute__ ((packed));
  
  
***************
*** 331,340 ****
    olsr_u32_t   addr;
    olsr_u32_t   netmask;
! };
  
  struct hnamsg
  {
    struct hnapair hna_net[1];
! };
  
  /*
--- 331,340 ----
    olsr_u32_t   addr;
    olsr_u32_t   netmask;
! } __attribute__ ((packed));
  
  struct hnamsg
  {
    struct hnapair hna_net[1];
! } __attribute__ ((packed));
  
  /*
***************
*** 346,355 ****
    struct in6_addr   addr;
    struct in6_addr   netmask;
! };
  
  struct hnamsg6
  {
    struct hnapair6 hna_net[1];
! };
  
  
--- 346,355 ----
    struct in6_addr   addr;
    struct in6_addr   netmask;
! } __attribute__ ((packed));
  
  struct hnamsg6
  {
    struct hnapair6 hna_net[1];
! } __attribute__ ((packed));
  
  
***************
*** 379,383 ****
    } message;
  
! };
  
  /*
--- 379,383 ----
    } message;
  
! } __attribute__ ((packed));
  
  /*
***************
*** 403,407 ****
    } message;
  
! };
  
  
--- 403,407 ----
    } message;
  
! } __attribute__ ((packed));
  
  
***************
*** 416,420 ****
    olsr_u16_t	  olsr_seqno;
    struct olsrmsg  olsr_msg[1];          /* variable messages */
! };
  
  
--- 416,420 ----
    olsr_u16_t	  olsr_seqno;
    struct olsrmsg  olsr_msg[1];          /* variable messages */
! } __attribute__ ((packed));
  
  
***************
*** 424,428 ****
    olsr_u16_t	    olsr_seqno;
    struct olsrmsg6   olsr_msg[1];         /* variable messages */
! };
  
  
--- 424,428 ----
    olsr_u16_t	    olsr_seqno;
    struct olsrmsg6   olsr_msg[1];         /* variable messages */
! } __attribute__ ((packed));
  
  
***************
*** 433,437 ****
    struct olsrmsg  v4;
    struct olsrmsg6 v6;
! };
  
  union olsr_packet
--- 433,437 ----
    struct olsrmsg  v4;
    struct olsrmsg6 v6;
! } __attribute__ ((packed));
  
  union olsr_packet
***************
*** 439,443 ****
    struct olsr  v4;
    struct olsr6 v6;
! };
  
  
--- 439,443 ----
    struct olsr  v4;
    struct olsr6 v6;
! } __attribute__ ((packed));