// Details of actualized connections.
struct Remote {
struct SockAddr uaddr; // The remote IP address
- struct SockAddr laddr; // The local IP address
+ struct SockAddr laddr; // The local IP for this remote
+ int ifindex; // The local interface index
struct Allowed *spec; // Rule being instantiated
struct timeval rec_when; // Last received packet time, in seconds
};
QueueItem base;
int fd;
struct SockAddr src; // the remote IP for this packet
- struct SockAddr dst; // the local IP for this packet
+ union {
+ struct in_pktinfo in4;
+ struct in6_pktinfo in6;
+ } dstinfo; // The PKTINFO for this packet
ssize_t len;
unsigned char buffer[ BUFSIZE ];
} PacketItem;
static char *tap = 0; // Name of tap, if any, or "-" for stdio
static int tap_fd = 0; // Also used for stdin in stdio mode
static int udp_fd;
+static int udp_port;
static int threads_count = 0;
static int buffers_count = 0;
return dowrite( tap_fd, buf, n );
}
+
+// All sorts of fiddling is needed to set the source address for UDP
+// And 2 different ways for pure ipv4 versus ipv6 sockets
+static void sendpacket4(unsigned char *buf, int n,struct Remote *r) {
+ // The UDP socket is pure ipv4
+ struct iovec data[1] = {{ .iov_base = buf, .iov_len = n }};
+ struct {
+ struct cmsghdr hdr;
+ struct in_pktinfo data;
+ } control = {
+ .hdr.cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo)),
+ .hdr.cmsg_level = IPPROTO_IP,
+ .hdr.cmsg_type = IP_PKTINFO,
+ .data.ipi_ifindex = r->ifindex,
+ .data.ipi_spec_dst = r->laddr.in4.sin_addr
+ };
+ struct msghdr msg = {
+ .msg_name = &r->uaddr.in4,
+ .msg_namelen = sizeof( struct sockaddr_in ),
+ .msg_iov = data,
+ .msg_iovlen = 1,
+ .msg_control = &control,
+ .msg_controllen = CMSG_SPACE( sizeof( struct in_pktinfo ) ),
+ .msg_flags = 0 // unused
+ };
+ if ( r->laddr.in.sa_family && 0 ) {
+ msg.msg_control = &control;
+ msg.msg_controllen = CMSG_SPACE( sizeof( struct in_pktinfo ) );
+ }
+ VERBOSE2OUT( "sendmsg %lu from %s to %s\n",
+ msg.msg_controllen,
+ inet_stoa( &r->laddr ),
+ inet_stoa( &r->uaddr ) );
+ if ( sendmsg( udp_fd, &msg, 0 ) < n ) {
+ perror( "Writing socket" );
+ }
+#if 0 // ILLUSTRATION
+ struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_level = IPPROTO_IP;
+ cmsg->cmsg_type = IP_PKTINFO;
+ cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
+ struct in_pktinfo *pktinfo = (struct in_pktinfo*) CMSG_DATA(cmsg);
+ pktinfo->ipi_ifindex = src_interface_index;
+ pktinfo->ipi_spec_dst = src_addr;
+ msg.msg_controllen =
+ return sendmsg( fd, &msg, IP_PKTINFO );
+#endif
+}
+
+static void sendpacket6(unsigned char *buf, int n,struct Remote *r) {
+ //NYI
+ (void)buf;
+ (void)n;
+ (void)r;
+}
+
// Write a packet via the given Interface with encryption as specified.
static void write_remote(unsigned char *buf, int n,struct Remote *r) {
// A packet buffer
if ( n < 12 ) {
VERBOSE2OUT( "SENDing %d bytes to %s\n", n, inet_stoa( &r->uaddr ) );
} else {
- VERBOSE2OUT( "SENDing %d bytes %s -> %s from %s to %s\n", n,
+ VERBOSE2OUT( "SENDing %d bytes %s -> %s to %s\n", n,
inet_mtoa( buf+6 ), inet_mtoa( buf ),
- inet_stoa( &r->laddr ),
inet_stoa( &r->uaddr ) );
}
memcpy( output, buf, n ); // Use the private buffer for delivery
} else if ( r->spec->psk.keyfile ) {
encrypt( output, n, &r->spec->psk );
}
- // Reserve for packet addressing
- struct in_pktinfo pkt4info = {
- .ipi_ifindex = 0, /* Interface index */
- .ipi_spec_dst.s_addr = 0, /* Local address */
- .ipi_addr.s_addr = 0, /* Header Destination address */
- };
- struct in6_pktinfo pkt6info = {
- .ipi6_addr.s6_addr32 = { 0, 0, 0, 0 },
- .ipi6_ifindex = 0,
- };
- void *pktinfo = 0;
- int pktinfosize = 0;
- struct sockaddr_in *sock4 = &r->uaddr.in4;
- struct sockaddr_in6 *sock6 = &r->uaddr.in6;
- void *sock;
- size_t size;
- int flags = 0;
if ( udp6 ) {
- // Note that the size of +struct sockaddr_in6+ is actually
- // larger than the size of +struct sockaddr+ (due to the
- // addition of the +sin6_flowinfo+ field). It results in the
- // following cuteness for passing arguments to +sendto+.
- sock = sock6;
- size = sizeof( struct sockaddr_in6 );
- VERBOSE2OUT( "IPv6 UDP %d %s %s\n", udp_fd,
- inet_stoa( &r->laddr ),
- inet_stoa( &r->uaddr ) );
- switch ( r->laddr.in.sa_family ) {
- case AF_INET6:
- memcpy( &pkt6info.ipi6_addr, &sock6->sin6_addr, 16 );
- pktinfo = &pkt6info;
- pktinfosize = sizeof( pkt6info );
- flags = IPV6_PKTINFO;
- break;
- case AF_INET:
- memcpy( &pkt4info.ipi_spec_dst, &sock4->sin_addr, 4 );
- pktinfo = &pkt4info;
- pktinfosize = sizeof( pkt4info );
- flags = IP_PKTINFO;
- break;
- }
+ sendpacket6( output, n, r );
} else {
- sock = sock4;
- size = sizeof( struct sockaddr_in );
- VERBOSE2OUT( "IPv4 UDP %d %s %s\n", udp_fd,
- inet_stoa( &r->laddr ),
- inet_stoa( &r->uaddr ) );
- memcpy( &pkt4info.ipi_spec_dst, &sock4->sin_addr, 4 );
- pktinfo = &pkt4info;
- pktinfosize = sizeof( pkt4info );
- flags = IP_PKTINFO;
- }
- VERBOSE2OUT( "SEND %d bytes from %s to %s [%s -> %s]\n",
- n,
- inet_stoa( &r->laddr ),
- inet_stoa( &r->uaddr ),
- ( n < 12 )? "" : inet_mtoa( buf+6 ),
- ( n < 12 )? "" : inet_mtoa( buf )
- );
- // IS sendmsg thread safe??
- struct iovec data[1] = {{ output, n }};
- struct msghdr msg = {
- .msg_name = sock,
- .msg_namelen = size,
- .msg_iov = data,
- .msg_iovlen = 1,
- .msg_control = pktinfo,
- .msg_controllen = pktinfosize,
- .msg_flags = 0 // unused
- };
- if ( sendmsg( udp_fd, &msg, flags ) < n ) {
- perror( "Writing socket" );
- // Invalidate remote temporarily instead? But if it's an
- // "uplink" it should be retried eventually...
- // For now: just ignore the error.
- // exit( 1 );
+ sendpacket4( output, n, r );
}
}
struct SockAddr *src = &pi->src;
struct Interface *x = input_check( buf, len, src );
if ( x == 0 ) {
+ VERBOSE2OUT( "not a nice packet\n" );
return; // not a nice packet
}
+ // Set the local addressing for the remote
+ if ( udp6 ) {
+ x->remote->ifindex = pi->dstinfo.in6.ipi6_ifindex;
+ x->remote->laddr.in6.sin6_family = AF_INET6;
+ x->remote->laddr.in6.sin6_port = htons( udp_port );
+ memcpy( &x->remote->laddr.in6.sin6_addr,
+ &pi->dstinfo.in6.ipi6_addr,
+ 16 );
+ } else {
+ x->remote->ifindex = pi->dstinfo.in4.ipi_ifindex;
+ x->remote->laddr.in4.sin_family = AF_INET;
+ x->remote->laddr.in4.sin_port = htons( udp_port );
+ memcpy( &x->remote->laddr.in4.sin_addr,
+ &pi->dstinfo.in4.ipi_spec_dst,
+ 4 );
+ }
if ( ( *buf & 1 ) == 0 ) {
// unicast
struct Interface *y = 0; // reuse for destination interface
Interface_DEL( y ); // Need to see this interface again
return;
}
- // Set the local address for the remote
- memcpy( &x->remote->laddr, &pi->dst, sizeof( pi->dst ) );
- VERBOSE2OUT( "RECV route %s -> %s using %s\n",
- inet_mtoa( buf+6 ), inet_mtoa( buf ),
- inet_stoa( &x->remote->laddr ) );
+ VERBOSE2OUT( "RECV route %s -> %s\n",
+ inet_mtoa( buf+6 ),
+ inet_mtoa( buf ) );
write_remote( buf, len, y->remote );
return;
}
perror( "RECV time" );
now.tv_sec = time( 0 );
}
- VERBOSE2OUT( "BC %s -> %s from %s\n",
+ VERBOSE2OUT( "BC %s -> %s from %s to %s\n",
inet_mtoa( buf+6 ), inet_mtoa( buf ),
- inet_stoa( &x->remote->uaddr ) );
+ inet_stoa( &x->remote->uaddr ),
+ inet_stoa( &x->remote->laddr ) );
struct Remote *r;
unsigned int i = 0;
Remote_LOCK;
} else {
if ( udp6 ) {
unmap_if_mapped( &todo->src );
- unmap_if_mapped( &todo->dst );
}
route_packet( todo );
}
memset( &todo->src, 0, sizeof( struct SockAddr ) );
- memset( &todo->dst, 0, sizeof( struct SockAddr ) );
+ memset( &todo->dstinfo, 0, sizeof( todo->dstinfo ) );
Queue_addItem( &todolist.free, (QueueItem*) todo );
}
return 0;
struct cmsghdr *cmsg = CMSG_FIRSTHDR( &msg );
if ( cmsg ) {
if ( udp6 ) {
- struct in6_pktinfo *pinf = (struct in6_pktinfo*) CMSG_DATA( cmsg );
- p->dst.in6.sin6_family = AF_INET6;
- memcpy( &p->dst.in6.sin6_addr, &pinf->ipi6_addr, 16 );
- VERBOSE2OUT( "DEST= udp6 %d %s\n",
- pinf->ipi6_ifindex, inet_stoa( &p->dst ) );
+ memcpy( &p->dstinfo.in6, CMSG_DATA( cmsg ),
+ sizeof( struct in6_pktinfo ) );
+ VERBOSE2OUT( "DEST= udp6 %d\n", p->dstinfo.in6.ipi6_ifindex );
} else {
- struct in_pktinfo *pinf = (struct in_pktinfo*) CMSG_DATA( cmsg );
- p->dst.in4.sin_family = AF_INET;
- p->dst.in4.sin_addr = pinf->ipi_addr;
- VERBOSE2OUT( "DEST= %d %s\n",
- pinf->ipi_ifindex, inet_stoa( &p->dst ) );
+ memcpy( &p->dstinfo.in4, CMSG_DATA( cmsg ),
+ sizeof( struct in_pktinfo ) );
+ VERBOSE2OUT( "DEST= %d\n", p->dstinfo.in4.ipi_ifindex );
}
}
return p->len;
// ip = ipv4 | [ipv6]
int main(int argc, char *argv[]) {
pthread_t thread; // Temporary thread id
- int port, i;
+ int i;
progname = (unsigned char *) argv[0];
///// Parse command line arguments
i = 1;
ENSUREARGS( 1 );
}
// then: required port
- if ( sscanf( argv[i++], "%d", &port ) != 1 ) {
+ if ( sscanf( argv[i++], "%d", &udp_port ) != 1 ) {
fprintf( stderr, "Bad local port: %s\n", argv[i-1] );
usage();
}
}
struct sockaddr_in udp_addr = {
.sin_family = AF_INET,
- .sin_port = htons( port ),
+ .sin_port = htons( udp_port ),
};
if ( udp_source.family == 0 ) {
udp_addr.sin_addr.s_addr = htonl( INADDR_ANY );
}
struct sockaddr_in6 udp6_addr = {
.sin6_family = AF_INET6,
- .sin6_port = htons( port ),
+ .sin6_port = htons( udp_port ),
};
memcpy( udp6_addr.sin6_addr.s6_addr, udp_source.address, 16 );
if ( bind( udp_fd, (struct sockaddr*) &udp6_addr, sizeof(udp6_addr))) {
projects / rrq / rrqnet.git / commitdiff