net: add gateway set up

This avoids loading down all the offload setups with a fairly bogus route
ioctl set, although for a full host stack that will still be needed.

Add support to ifconfig accordingly

Applications/netd/ifconfig.c

@@ -55,7 +55,12 @@ static void do_ip_mask_set(char *p)
 
 static void do_ip_dst_set(char *p)
 {
-	do_ip_set(p, SIOCSIFDSTADDR, "address");
+	do_ip_set(p, SIOCSIFDSTADDR, "destination");
+}
+
+static void do_ip_gw_set(char *p)
+{
+	do_ip_set(p, SIOCSIFGWADDR, "gateway");
 }
 
 static void do_flags(unsigned int mask, unsigned int val)
@@ -86,6 +91,10 @@ static int do_keyword(char **arg)
 		do_ip_dst_set(arg[1]);
 		return 2;
 	}
+	if (strcmp(*arg, "gw") == 0) {
+		do_ip_gw_set(arg[1]);
+		return 2;
+	}
 	if (strcmp(*arg, "broadcast") == 0) {
 		do_ip_broad_set(arg[1]);
 		return 2;
@@ -114,10 +123,11 @@ static const char *fnames[] = {
 	NULL
 };
 
-static void ip_print(const char *name, int ioc)
+static void ip_print(const char *name, int ioc, int skipok)
 {
 	if (ioctl(sock, ioc, &ifr) == -1) {
-		fprintf(stderr, "ifconfig: unable to get %s.\n", name);
+		if (skipok == 0)
+			fprintf(stderr, "ifconfig: unable to get %s.\n", name);
 		return;
 	}
 	/* This is a union and all addresses overlap */
@@ -147,7 +157,7 @@ static void display_hwaddr(void)
 	case HW_ETH:
 	case HW_WLAN:
 		printf("ether: ");
-		for (i = 0; i < 7; i++)
+		for (i = 0; i < 5; i++)
 			printf("%02X:", *p++);
 		printf("%02X  ", *p);
 		break;
@@ -182,14 +192,15 @@ static void dump_interface(void)
 		printf("  mtu %d\n", ifr.ifr_mtu);
 	if (ioctl(sock, SIOCGIFHWADDR, &ifr) == 0)
 		display_hwaddr();
-	ip_print("inet", SIOCGIFADDR);
-	if (flags & IFF_POINTOPOINT)
-		ip_print("destination", SIOCGIFDSTADDR);
+	ip_print("inet", SIOCGIFADDR, 0);
+	if (flags & IFF_POINTOPOINT, 0)
+		ip_print("destination", SIOCGIFDSTADDR, 0);
 	else
-		ip_print("netmask", SIOCGIFNETMASK);
-	ip_print("broadcast", SIOCGIFBRDADDR);
-	/* And we don't keep statistics */
+		ip_print("netmask", SIOCGIFNETMASK, 0);
+	ip_print("broadcast", SIOCGIFBRDADDR, 1);
+	ip_print("gateway", SIOCGIFGWADDR, 1);
 	printf("\n");
+	/* And we don't keep statistics */
 }
 
 static void list_interfaces(void)
@@ -219,7 +230,7 @@ int main(int argc, char *argv[])
 		list_interfaces();
 		return 0;
 	}
-	strcpy(ifr.ifr_name, argv[1]);
+	strncpy(ifr.ifr_name, argv[1], sizeof(ifr.ifr_name));
 	if (ioctl(sock, SIOCGIFADDR, &ifr) == -1) {
 		perror(ifr.ifr_name);
 		return 1;

Kernel/include/netdev.h

@@ -129,13 +129,24 @@ struct ifreq {
 		struct ksockaddr ifr_dstaddr;
 		struct ksockaddr ifr_broadaddr;
 		struct ksockaddr ifr_netmask;
+		struct ksockaddr ifr_gwaddr;
 		struct ksockaddr ifr_hwaddr;
 		short ifr_flags;
 		int ifr_ifindex;
 		int ifr_mtu;
-	};
+	} ifr_ifru;
 };
 
+#define ifr_addr	ifr_ifru.ifr_addr
+#define ifr_dstaddr	ifr_ifru.ifr_dstaddr
+#define ifr_broadaddr	ifr_ifru.ifr_broadaddr
+#define ifr_netmask	ifr_ifru.ifr_netmask
+#define ifr_hwaddr	ifr_ifru.ifr_hwaddr
+#define ifr_gwaddr	ifr_ifru.ifr_gwaddr
+#define ifr_flags	ifr_ifru.ifr_flags
+#define ifr_ifindex	ifr_ifru.ifr_ifindex
+#define ifr_mtu		ifr_ifru.ifr_mtu
+
 #define IFF_UP		0x0001
 #define IFF_BROADCAST	0x0002
 #define IFF_LOOPBACK	0x0004
@@ -162,6 +173,11 @@ struct ifreq {
 #define SIOCSIFHWADDR	(0x040D|IOCTL_SUPER)
 #define SIOCGIFMTU	0x040E
 #define SIOCSIFMTU	(0x040F|IOCTL_SUPER)
+/* These two are a Fuzix specific thing. It's much easier to think about
+   simple interfaces this way than require 'route'. The native net may
+   well require 'route' but can just omit this ioctl pair */
+#define SIOCGIFGWADDR	0x0410
+#define SIOCSIFGWADDR	(0x0411|IOCTL_SUPER)
 
 
 /* Network layer syscalls */

Library/include/net/if.h

@@ -19,6 +19,7 @@ struct ifreq {
 		struct sockaddr ifr_dstaddr;
 		struct sockaddr ifr_broadaddr;
 		struct sockaddr ifr_netmask;
+		struct sockaddr ifr_gwaddr;
 		struct sockaddr ifr_hwaddr;
 		short ifr_flags;
 		int ifr_ifindex;
@@ -31,6 +32,7 @@ struct ifreq {
 #define ifr_broadaddr	ifr_ifru.ifr_broadaddr
 #define ifr_netmask	ifr_ifru.ifr_netmask
 #define ifr_hwaddr	ifr_ifru.ifr_hwaddr
+#define ifr_gwaddr	ifr_ifru.ifr_gwaddr
 #define ifr_flags	ifr_ifru.ifr_flags
 #define ifr_ifindex	ifr_ifru.ifr_ifindex
 #define ifr_mtu		ifr_ifru.ifr_mtu
@@ -61,6 +63,8 @@ struct ifreq {
 #define SIOCSIFHWADDR	(0x040D|__IOCTL_SUPER)
 #define SIOCGIFMTU	0x040E
 #define SIOCSIFMTU	(0x040F|__IOCTL_SUPER)
+#define SIOCGIFGWADDR	0x0410
+#define SIOCSIFGWADDR	(0x0411|__IOCTL_SUPER)
 
 #define HW_NONE		0	/* e.g. loopback */
 #define HW_ETH		1