projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused argument from tunemu_write.
[tinc]
/
src
/
ipv4.h
diff --git
a/src/ipv4.h
b/src/ipv4.h
index
57d236d
..
2761582
100644
(file)
--- a/
src/ipv4.h
+++ b/
src/ipv4.h
@@
-1,7
+1,10
@@
+#ifndef TINC_IPV4_H
+#define TINC_IPV4_H
+
/*
ipv4.h -- missing IPv4 related definitions
Copyright (C) 2005 Ivo Timmermans
/*
ipv4.h -- missing IPv4 related definitions
Copyright (C) 2005 Ivo Timmermans
- 2006 Guus Sliepen <guus@tinc-vpn.org>
+ 2006
-2012
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-18,9
+21,6
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __TINC_IPV4_H__
-#define __TINC_IPV4_H__
-
#ifndef AF_INET
#define AF_INET 2
#endif
#ifndef AF_INET
#define AF_INET 2
#endif
@@
-64,15
+64,15
@@
#ifndef HAVE_STRUCT_IP
struct ip {
#if __BYTE_ORDER == __LITTLE_ENDIAN
#ifndef HAVE_STRUCT_IP
struct ip {
#if __BYTE_ORDER == __LITTLE_ENDIAN
- unsigned int ip_hl:4;
- unsigned int ip_v:4;
+ unsigned int ip_hl:
4;
+ unsigned int ip_v:
4;
#else
#else
- unsigned int ip_v:4;
- unsigned int ip_hl:4;
+ unsigned int ip_v:
4;
+ unsigned int ip_hl:
4;
#endif
uint8_t ip_tos;
uint16_t ip_len;
#endif
uint8_t ip_tos;
uint16_t ip_len;
- uint16_t ip_id;
+ uint16_t ip_id;
uint16_t ip_off;
#define IP_RF 0x8000
#define IP_DF 0x4000
uint16_t ip_off;
#define IP_RF 0x8000
#define IP_DF 0x4000
@@
-81,7
+81,7
@@
struct ip {
uint8_t ip_p;
uint16_t ip_sum;
struct in_addr ip_src, ip_dst;
uint8_t ip_p;
uint16_t ip_sum;
struct in_addr ip_src, ip_dst;
-} __attribute__
((__packed__));
+} __attribute__
((__gcc_struct__)) __attribute
((__packed__));
#endif
#ifndef IP_OFFMASK
#endif
#ifndef IP_OFFMASK
@@
-143,7
+143,7
@@
struct icmp {
#define icmp_radv icmp_dun.id_radv
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
#define icmp_radv icmp_dun.id_radv
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
-} __attribute__
((__packed__));
+} __attribute__
((__gcc_struct__)) __attribute
((__packed__));
#endif
#endif
-#endif
/* __TINC_IPV4_H__ */
+#endif