projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply patch from Scott Lamb unifying configuration of TCP socket options.
[tinc]
/
lib
/
ipv4.h
diff --git
a/lib/ipv4.h
b/lib/ipv4.h
index
39d914e
..
39e88d3
100644
(file)
--- a/
lib/ipv4.h
+++ b/
lib/ipv4.h
@@
-1,7
+1,7
@@
/*
ipv4.h -- missing IPv4 related definitions
/*
ipv4.h -- missing IPv4 related definitions
- Copyright (C) 200
3 Ivo Timmermans <ivo@o2w.nl
>
- 200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 200
5 Ivo Timmermans <ivo@tinc-vpn.org
>
+ 200
5 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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: ipv4.h,v 1.1.2.2 2003/07/18 13:42:35 guus Exp
$
+ $Id$
*/
#ifndef __TINC_IPV4_H__
*/
#ifndef __TINC_IPV4_H__
@@
-35,6
+35,10
@@
#define ICMP_DEST_UNREACH 3
#endif
#define ICMP_DEST_UNREACH 3
#endif
+#ifndef ICMP_FRAG_NEEDED
+#define ICMP_FRAG_NEEDED 4
+#endif
+
#ifndef ICMP_NET_UNKNOWN
#define ICMP_NET_UNKNOWN 6
#endif
#ifndef ICMP_NET_UNKNOWN
#define ICMP_NET_UNKNOWN 6
#endif
@@
-57,18
+61,21
@@
struct ip {
unsigned int ip_hl:4;
#endif
uint8_t ip_tos;
unsigned int ip_hl:4;
#endif
uint8_t ip_tos;
- u
_shor
t ip_len;
- u
_shor
t ip_id;
- u
_shor
t ip_off;
+ u
int16_
t ip_len;
+ u
int16_
t ip_id;
+ u
int16_
t ip_off;
#define IP_RF 0x8000
#define IP_DF 0x4000
#define IP_MF 0x2000
#define IP_RF 0x8000
#define IP_DF 0x4000
#define IP_MF 0x2000
-#define IP_OFFMASK 0x1fff
uint8_t ip_ttl;
uint8_t ip_p;
uint8_t ip_ttl;
uint8_t ip_p;
- u
_shor
t ip_sum;
+ u
int16_
t ip_sum;
struct in_addr ip_src, ip_dst;
struct in_addr ip_src, ip_dst;
-};
+} __attribute__ ((__packed__));
+#endif
+
+#ifndef IP_OFFMASK
+#define IP_OFFMASK 0x1fff
#endif
#ifndef HAVE_STRUCT_ICMP
#endif
#ifndef HAVE_STRUCT_ICMP
@@
-77,7
+84,7
@@
struct icmp {
uint8_t icmp_code;
uint16_t icmp_cksum;
union {
uint8_t icmp_code;
uint16_t icmp_cksum;
union {
- u
_char
ih_pptr;
+ u
int8_t
ih_pptr;
struct in_addr ih_gwaddr;
struct ih_idseq {
uint16_t icd_id;
struct in_addr ih_gwaddr;
struct ih_idseq {
uint16_t icd_id;
@@
-126,7
+133,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__))
;
#endif
#endif /* __TINC_IPV4_H__ */
#endif
#endif /* __TINC_IPV4_H__ */