Bug fixes. Verified that DHCP works for ip address assignment.

Author: jbreams

common.c

@@ -53,7 +53,7 @@ void logit(int level, char * fmt, ...) {
 	int err;
 	va_list ap;
 
-	if(level = 0)
+	if(level == 0)
 		err = LOG_INFO;
 	else if(level == -1) {
 		if(verbose == 0)

gssvpn.c

@@ -41,6 +41,7 @@
 #include <errno.h>
 #ifdef HAVE_IFADDRS_H
 #include <ifaddrs.h>
+#include <net/if_dl.h>
 #endif
 #include "libev/ev.h"
 #include "gssvpn.h"
@@ -108,8 +109,10 @@ int do_netinit(struct ev_loop * loop, gss_buffer_desc * in) {
 	pid_t pid;
 	int ts, argc = 0;
 
-	if(!netinit_util)
+	if(!netinit_util) {
+		init = 1;
 		return 0;
+	}
 
 	init = 1;
 	last_init_activity = ev_now(loop);
@@ -223,8 +226,7 @@ void netfd_read_cb(struct ev_loop * loop, ev_io * ios, int revents) {
 		logit(-1, "Writing %d bytes to TAP", packet.length);
 		ssize_t s = write(tapfd, packet.value, packet.length);
 		if(s < 0)
-			logit(1, "Error writing packet to tap: %s",
-				strerror(errno));
+			logit(1, "Error writing packet to tap: %s", strerror(errno));
 	}
 	else if(pac == PAC_NETINIT) {
 		if(packet.length > 0) {
@@ -293,7 +295,8 @@ int get_mac() {
 		return -1;
 	}
 
-	memcpy(mac, cifp->ifa_addr->sa_data, sizeof(mac));
+	struct sockaddr_dl* sdl = (struct sockaddr_dl*)cifp->ifa_addr;
+	memcpy(mac, LLADDR(sdl), sizeof(mac));
 	freeifaddrs(ifp);
 #endif
 	return 0;

gssvpnd.c

@@ -262,10 +262,8 @@ void handle_netinit(struct ev_loop * loop, struct conn * client,
 		clients_ether[eh] = client;
 	}
 
-	if(!netinit_util) {
-		send_packet(netfd, NULL, &client->addr, PAC_NETINIT);
+	if(!netinit_util)
 		return;
-	}
 
 	if(pipe(fds) < 0) {
 		logit(1, "Error creating pipe during netinit %s", strerror(errno));
@@ -295,7 +293,6 @@ void handle_netinit(struct ev_loop * loop, struct conn * client,
 		char portstr[6];
 		char * filename = netinit_util + (strlen(netinit_util) - 1);
 		uint8_t i;
-		OM_uint32 min;
 
 		close(netfd);
 		close(tapfd);
@@ -305,6 +302,8 @@ void handle_netinit(struct ev_loop * loop, struct conn * client,
 		if(*filename == '/')
 			filename++;
 
+		sprintf(portstr, "%d", client->addr.sin_port);
+
 		dup2(fds[1], fileno(stdout));
 		if(execl(netinit_util, filename, client->princname,
 			client->ipstr, portstr, NULL) < 0)
@@ -403,9 +402,6 @@ void netfd_read_cb(struct ev_loop * loop, ev_io * ios, int revents) {
 		size_t s = write(tapfd, packet.value, packet.length);
 		if(s < 0)
 			logit(1, "Error writing to tap: %s", strerror(errno));
-		else if(s < packet.length)
-			logit(1, "Wrote less than expected to tap: %s < %s",
-				s, packet.length);
 		gss_release_buffer(&min, &packet);
 	}
 	else if(pac == PAC_GSSINIT)

linux-server.pl

@@ -58,9 +58,6 @@
 	elsif($inuser && $_ =~ /ip\s+($ipmatch)\s*$/) {
 		$clientip = $1;
 	}
-	elsif($inuser && $_ =~ /mac\s+((?:[0-9a-f]{2}[:-]){5}[0-9a-f]{2})/i) {
-		$clientmac = $1;
-	}
 	elsif($inuser && $_ =~ /dhcp/i) {
 		$clientip = 'dhcp';
 	}
@@ -69,17 +66,10 @@
 
 (!($clientip && $subnet)) && die "Must specify client ip and subnet.";
 
-if(!$clientmac) {
-	for($i = 0; $i < 6; $i++) {
-		$clientmac .= sprintf("%02x:", rand(255));
-	}
-	chop $clientmac;
-}
-
 if($clientip =~ /dhcp/) {
-	print "$clientmac\ndhcp\nsubnet\n$subnet\ngateway\n$gateway\n";
+	print "dhcp\nsubnet\n$subnet\ngateway\n$gateway\n";
 } else {
-	print "$clientmac\nip\n$clientip\nsubnet\n$subnet\ngateway\n$gateway\n";
+	print "ip\n$clientip\nsubnet\n$subnet\ngateway\n$gateway\n";
 }
 
 !$gateway && exit 0;

mac-client.pl

@@ -52,13 +52,11 @@
 	system "ifconfig $tapdev inet $ipaddr netmask $subnet";
 }
 
-system "ipconfig waitall";
-
 if(!$gateway) {
 	exit 0;
 }
 
-system "ping -c 1 -n $gateway";
+system "ping -o -q -n $gateway";
 
 foreach my $dest (@routenets) {
 	system "route add -net $dest $gateway";