projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replacement for the current routing algorithm.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
922c5cf
..
a16db15
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-1,7
+1,7
@@
/*
net.h -- header for net.c
Copyright (C) 1998-2002 Ivo Timmermans <zarq@iname.com>
/*
net.h -- header for net.c
Copyright (C) 1998-2002 Ivo Timmermans <zarq@iname.com>
- 2000-2002 Guus Sliepen <guus@sliepen.
warande.net
>
+ 2000-2002 Guus Sliepen <guus@sliepen.
eu.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: net.h,v 1.9.4.
49 2002/03/27 15:01:36
guus Exp $
+ $Id: net.h,v 1.9.4.
52 2002/06/21 10:11:12
guus Exp $
*/
#ifndef __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
@@
-28,6
+28,10
@@
#include <netinet/in.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <sys/time.h>
+#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+#endif
+
#include "config.h"
#ifdef ENABLE_JUMBOGRAMS
#include "config.h"
#ifdef ENABLE_JUMBOGRAMS
@@
-46,12
+50,12
@@
typedef struct mac_t
{
typedef struct mac_t
{
- u
nsigned char
x[6];
+ u
int8_t
x[6];
} mac_t;
typedef struct ipv4_t
{
} mac_t;
typedef struct ipv4_t
{
- u
nsigned char
x[4];
+ u
int8_t
x[4];
} ipv4_t;
typedef struct ip_mask_t {
} ipv4_t;
typedef struct ip_mask_t {
@@
-61,7
+65,7
@@
typedef struct ip_mask_t {
typedef struct ipv6_t
{
typedef struct ipv6_t
{
- u
nsigned shor
t x[8];
+ u
int16_
t x[8];
} ipv6_t;
typedef unsigned short port_t;
} ipv6_t;
typedef unsigned short port_t;
@@
-83,8
+87,8
@@
typedef union {
typedef struct vpn_packet_t {
length_t len; /* the actual number of bytes in the `data' field */
int priority; /* priority or TOS */
typedef struct vpn_packet_t {
length_t len; /* the actual number of bytes in the `data' field */
int priority; /* priority or TOS */
- u
nsigned int seqno;
/* 32 bits sequence number (network byte order of course) */
- u
nsigned char
data[MAXSIZE];
+ u
int32_t seqno;
/* 32 bits sequence number (network byte order of course) */
+ u
int8_t
data[MAXSIZE];
} vpn_packet_t;
typedef struct queue_element_t {
} vpn_packet_t;
typedef struct queue_element_t {