projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update dutch translation
[oweals/tinc.git]
/
lib
/
ipv4.h
diff --git
a/lib/ipv4.h
b/lib/ipv4.h
index ec3c511561431fbb9e11b2d76d20b86aab9892bb..4be432f7331ce3a5816f5dbc919cc66c6bd8dda5 100644
(file)
--- a/
lib/ipv4.h
+++ b/
lib/ipv4.h
@@
-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.
1 2003/07/18 12:16:23
guus Exp $
+ $Id: ipv4.h,v 1.1.2.
3 2003/07/21 13:14:02
guus Exp $
*/
#ifndef __TINC_IPV4_H__
*/
#ifndef __TINC_IPV4_H__
@@
-47,8
+47,7
@@
#define IP_MSS 576
#endif
#define IP_MSS 576
#endif
-#ifndef HAVE_NETINET_IP_H
-
+#ifndef HAVE_STRUCT_IP
struct ip {
#if __BYTE_ORDER == __LITTLE_ENDIAN
unsigned int ip_hl:4;
struct ip {
#if __BYTE_ORDER == __LITTLE_ENDIAN
unsigned int ip_hl:4;
@@
-58,29
+57,27
@@
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_OFFMASK 0x1fff
uint8_t ip_ttl;
uint8_t ip_p;
#define IP_RF 0x8000
#define IP_DF 0x4000
#define IP_MF 0x2000
#define IP_OFFMASK 0x1fff
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;
};
-
#endif
#endif
-#ifndef HAVE_NETINET_IP_ICMP_H
-
+#ifndef HAVE_STRUCT_ICMP
struct icmp {
uint8_t icmp_type;
uint8_t icmp_code;
uint16_t icmp_cksum;
union {
struct icmp {
uint8_t icmp_type;
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;
@@
-130,7
+127,6
@@
struct icmp {
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
};
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
};
-
#endif
#endif /* __TINC_IPV4_H__ */
#endif
#endif /* __TINC_IPV4_H__ */