projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure malloc() is declared.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
922c5cf
..
490cdcf
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,51
+17,52
@@
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.
54 2002/09/10 22:12:33
guus Exp $
*/
#ifndef __TINC_NET_H__
#define __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
#define __TINC_NET_H__
+#include "config.h"
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/time.h>
-#include "config.h"
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
#ifdef ENABLE_JUMBOGRAMS
#ifdef ENABLE_JUMBOGRAMS
-
#define MTU 9014
/* 9000 bytes payload + 14 bytes ethernet header */
-
#define MAXSIZE 9100
/* MTU + header (seqno) and trailer (CBC padding and HMAC) */
-
#define MAXBUFSIZE 9100
/* Must support TCP packets of length 9000. */
+
#define MTU 9014
/* 9000 bytes payload + 14 bytes ethernet header */
+
#define MAXSIZE 9100
/* MTU + header (seqno) and trailer (CBC padding and HMAC) */
+
#define MAXBUFSIZE 9100
/* Must support TCP packets of length 9000. */
#else
#else
-
#define MTU 1514
/* 1500 bytes payload + 14 bytes ethernet header */
-
#define MAXSIZE 1600
/* MTU + header (seqno) and trailer (CBC padding and HMAC) */
-
#define MAXBUFSIZE 2100
/* Quite large but needed for support of keys up to 8192 bits. */
+
#define MTU 1514
/* 1500 bytes payload + 14 bytes ethernet header */
+
#define MAXSIZE 1600
/* MTU + header (seqno) and trailer (CBC padding and HMAC) */
+
#define MAXBUFSIZE 2100
/* Quite large but needed for support of keys up to 8192 bits. */
#endif
#endif
-#define MAXSOCKETS 128 /* Overkill... */
+#define MAXSOCKETS 128
/* Overkill... */
-#define MAXQUEUELENGTH 8 /* Maximum number of packats in a single queue */
+#define MAXQUEUELENGTH 8
/* Maximum number of packats in a single queue */
-typedef struct mac_t
-{
- unsigned char x[6];
+typedef struct mac_t {
+ uint8_t x[6];
} mac_t;
} mac_t;
-typedef struct ipv4_t
-{
- unsigned char x[4];
+typedef struct ipv4_t {
+ uint8_t x[4];
} ipv4_t;
typedef struct ip_mask_t {
} ipv4_t;
typedef struct ip_mask_t {
- ipv4_t address;
- ipv4_t mask;
+
ipv4_t address;
+
ipv4_t mask;
} ip_mask_t;
} ip_mask_t;
-typedef struct ipv6_t
-{
- unsigned short x[8];
+typedef struct ipv6_t {
+ uint16_t x[8];
} ipv6_t;
typedef unsigned short port_t;
} ipv6_t;
typedef unsigned short port_t;
@@
-69,9
+70,9
@@
typedef unsigned short port_t;
typedef short length_t;
typedef union {
typedef short length_t;
typedef union {
- struct sockaddr sa;
- struct sockaddr_in in;
- struct sockaddr_in6 in6;
+
struct sockaddr sa;
+
struct sockaddr_in in;
+
struct sockaddr_in6 in6;
} sockaddr_t;
#ifdef SA_LEN
} sockaddr_t;
#ifdef SA_LEN
@@
-81,35
+82,35
@@
typedef union {
#endif
typedef struct vpn_packet_t {
#endif
typedef struct vpn_packet_t {
-
length_t len;
/* the actual number of bytes in the `data' field */
-
int priority;
/* priority or TOS */
-
unsigned int seqno;
/* 32 bits sequence number (network byte order of course) */
-
unsigned char
data[MAXSIZE];
+
length_t len;
/* the actual number of bytes in the `data' field */
+
int priority;
/* priority or TOS */
+
uint32_t seqno;
/* 32 bits sequence number (network byte order of course) */
+
uint8_t
data[MAXSIZE];
} vpn_packet_t;
typedef struct queue_element_t {
} vpn_packet_t;
typedef struct queue_element_t {
- void *packet;
- struct queue_element_t *prev;
- struct queue_element_t *next;
+
void *packet;
+
struct queue_element_t *prev;
+
struct queue_element_t *next;
} queue_element_t;
typedef struct packet_queue_t {
} queue_element_t;
typedef struct packet_queue_t {
- queue_element_t *head;
- queue_element_t *tail;
+
queue_element_t *head;
+
queue_element_t *tail;
} packet_queue_t;
typedef struct outgoing_t {
} packet_queue_t;
typedef struct outgoing_t {
- char *name;
- int timeout;
- struct config_t *cfg;
- struct addrinfo *ai;
- struct addrinfo *aip;
+
char *name;
+
int timeout;
+
struct config_t *cfg;
+
struct addrinfo *ai;
+
struct addrinfo *aip;
} outgoing_t;
typedef struct listen_socket_t {
} outgoing_t;
typedef struct listen_socket_t {
- int tcp;
- int udp;
- sockaddr_t sa;
+
int tcp;
+
int udp;
+
sockaddr_t sa;
} listen_socket_t;
extern int maxtimeout;
} listen_socket_t;
extern int maxtimeout;
@@
-119,7
+120,7
@@
extern int addressfamily;
extern char *request_name[];
extern char *status_text[];
extern char *request_name[];
extern char *status_text[];
-#include "connection.h" /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
+#include "connection.h"
/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;
@@
-150,4
+151,4
@@
extern void terminate_connection(connection_t *, int);
extern void flush_queue(struct node_t *);
extern int read_rsa_public_key(struct connection_t *);
extern void flush_queue(struct node_t *);
extern int read_rsa_public_key(struct connection_t *);
-#endif /* __TINC_NET_H__ */
+#endif
/* __TINC_NET_H__ */