projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to reply to neighbor solicitation requests.
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
1100071
..
07e589a
100644
(file)
--- a/
src/net.h
+++ b/
src/net.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: net.h,v 1.9.4.
39 2002/02/18 16:25:16
guus Exp $
+ $Id: net.h,v 1.9.4.
46 2002/03/01 14:09:31
guus Exp $
*/
#ifndef __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
@@
-34,6
+34,7
@@
#define MAXSIZE 1600 /* MTU + header (seqno) and trailer (CBC padding and HMAC) */
#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */
#define MAXSIZE 1600 /* MTU + header (seqno) and trailer (CBC padding and HMAC) */
#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */
+#define MAXSOCKETS 128 /* Overkill... */
typedef struct mac_t
{
typedef struct mac_t
{
@@
-65,10
+66,15
@@
typedef union {
struct sockaddr_in6 in6;
} sockaddr_t;
struct sockaddr_in6 in6;
} sockaddr_t;
-#define SA_PORT(s) ((s.sa.sa_family==AF_INET)?s.in.sin_port:(s.sa.sa_family==AF_INET6)?s.in6.sin6_port:0)
+#ifdef SA_LEN
+#define SALEN(s) SA_LEN(&s)
+#else
+#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
+#endif
typedef struct vpn_packet_t {
length_t len; /* the actual number of bytes in the `data' field */
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];
} vpn_packet_t;
unsigned int seqno; /* 32 bits sequence number (network byte order of course) */
unsigned char data[MAXSIZE];
} vpn_packet_t;
@@
-101,19
+107,21
@@
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 int tcp_socket;
-extern int udp_socket;
+extern int tcp_socket[MAXSOCKETS];
+extern int udp_socket[MAXSOCKETS];
+extern int listen_sockets;
extern int keyexpires;
extern int keylifetime;
extern int do_prune;
extern int do_purge;
extern char *myport;
extern int keyexpires;
extern int keylifetime;
extern int do_prune;
extern int do_purge;
extern char *myport;
+extern time_t now;
extern void retry_outgoing(outgoing_t *);
extern void retry_outgoing(outgoing_t *);
-extern void handle_incoming_vpn_data(
void
);
+extern void handle_incoming_vpn_data(
int
);
extern void finish_connecting(connection_t *);
extern void do_outgoing_connection(connection_t *);
extern void finish_connecting(connection_t *);
extern void do_outgoing_connection(connection_t *);
-extern int handle_new_meta_connection(
void
);
+extern int handle_new_meta_connection(
int
);
extern int setup_listen_socket(sockaddr_t *);
extern int setup_vpn_in_socket(sockaddr_t *);
extern void send_packet(struct node_t *, vpn_packet_t *);
extern int setup_listen_socket(sockaddr_t *);
extern int setup_vpn_in_socket(sockaddr_t *);
extern void send_packet(struct node_t *, vpn_packet_t *);