// === CONSTANTS ===
#define FILENAME_MAX 255
#define IPSTACK_ROOT "/Devices/ip"
+#define DEFAULT_METRIC 30
// TODO: Move this to a header
#define ntohs(v) (((v&0xFF)<<8)|((v>>8)&0xFF))
void DumpInterface(const char *Name);
void DumpRoute(const char *Name);
int AddInterface(const char *Device);
-void AddRoute(const char *Interface, void *Dest, int MaskBits, void *NextHop);
+void AddRoute(const char *Interface, int AddressType, void *Dest, int MaskBits, int Metric, void *NextHop);
int DoAutoConfig(const char *Device);
int SetAddress(int IFNum, const char *Address);
- int ParseIPAddres(const char *Address, uint8_t *Dest, int *SubnetBits);
+ int ParseIPAddress(const char *Address, uint8_t *Dest, int *SubnetBits);
// === CODE ===
/**
return 0;
}
- if( strcmp(argv[1], "routes") == 0 ) {
- DumpRoutes();
+ // Routes
+ if( strcmp(argv[1], "route") == 0 )
+ {
+ // Add new route
+ if( argc > 2 && strcmp(argv[2], "add") == 0 )
+ {
+ uint8_t dest[16] = {0};
+ uint8_t nextHop[16] = {0};
+ int addrType, subnetBits = -1;
+ int nextHopType, nextHopBits=-1;
+ char *ifaceName = NULL;
+ int metric = DEFAULT_METRIC;
+ // Usage:
+ // ifconfig route add <host>[/<prefix>] <interface> [<metric>]
+ // ifconfig route add <host>[/<prefix>] <next hop> [<metric>]
+ if( argc - 3 < 2 ) {
+ fprintf(stderr, "ERROR: '%s route add' takes at least two arguments, %i passed\n",
+ argv[0], argc-3);
+ PrintUsage(argv[0]);
+ return -1;
+ }
+
+ if( argc - 3 > 3 ) {
+ fprintf(stderr, "ERROR: '%s route add' takes at most three arguments, %i passed\n",
+ argv[0], argc-3);
+ PrintUsage(argv[0]);
+ return -1;
+ }
+
+ // Destination IP
+ addrType = ParseIPAddress(argv[3], dest, &subnetBits);
+ if( subnetBits == -1 ) {
+ subnetBits = Net_GetAddressSize(addrType)*8;
+ }
+ // Interface Name / Next Hop
+ if( (nextHopType = ParseIPAddress(argv[4], nextHop, &nextHopBits)) == 0 )
+ {
+ // Interface name
+ ifaceName = argv[4];
+ }
+ else
+ {
+ // Next Hop
+ // - Check if it's the same type as the network/destination
+ if( nextHopType != addrType ) {
+ fprintf(stderr, "ERROR: Address type mismatch\n");
+ return -1;
+ }
+ // - Make sure there's no mask
+ if( nextHopBits != -1 ) {
+ fprintf(stderr, "Error: Next hop cannot be masked\n");
+ return -1;
+ }
+ }
+
+ // Metric
+ if( argc - 3 >= 3 )
+ {
+ metric = atoi(argv[5]);
+ if( metric == 0 && argv[5][0] != '0' ) {
+ fprintf(stderr, "ERROR: Metric should be a number\n");
+ return -1;
+ }
+ }
+
+ // Make the route!
+ AddRoute(ifaceName, addrType, dest, subnetBits, metric, nextHop);
+
+ return 0;
+ }
+ // Delete a route
+ else if( argc > 2 && strcmp(argv[2], "del") == 0 )
+ {
+ // Usage:
+ // ifconfig route del <routenum>
+ // ifconfig route del <host>[/<prefix>]
+ }
+ else
+ {
+ // List routes
+ DumpRoutes();
+ }
return 0;
}
-
// Add a new interface
- if( strcmp(argv[1], "add") == 0 ) {
+ else if( strcmp(argv[1], "add") == 0 )
+ {
if( argc < 4 ) {
fprintf(stderr, "ERROR: '%s add' requires two arguments, %i passed\n", argv[0], argc-2);
PrintUsage(argv[0]);
ret = SetAddress( ret, argv[3] );
return ret;
}
-
// Delete an interface
- if( strcmp(argv[1], "del") == 0 ) {
+ else if( strcmp(argv[1], "del") == 0 )
+ {
if( argc < 3 ) {
fprintf(stderr, "ERROR: '%s del' requires an argument\n", argv[0]);
PrintUsage(argv[0]);
}
// TODO:
}
-
// Autoconfigure an interface
// NOTE: Debugging hack (see the function for more details)
- if( strcmp(argv[1], "autoconf") == 0 ) {
+ else if( strcmp(argv[1], "autoconf") == 0 )
+ {
DoAutoConfig(argv[2]);
return 0;
}
+ else if( strcmp(argv[1], "help") == 0 || strcmp(argv[1], "--help") == 0 )
+ {
+ PrintUsage(argv[0]);
+ return 0;
+ }
- // Print usage instructions
- PrintUsage(argv[0]);
+ // Dump a named interface
+ DumpInterface(argv[1]);
return 0;
}
fprintf(stderr, " Add a new interface listening on <device> with the specified\n");
fprintf(stderr, " address.\n");
fprintf(stderr, " %s del <interface>\n", ProgName);
- fprintf(stderr, " %s set <interface> <option> <value>\n", ProgName);
- fprintf(stderr, " Set an option on an interface, a list of valid options follows\n");
- fprintf(stderr, " gw IPv4 default gateway\n");
+ fprintf(stderr, " Delete an interface\n");
fprintf(stderr, " %s [<interface>]\n", ProgName);
fprintf(stderr, " Print the current interfaces (or only <interface> if passed)\n");
fprintf(stderr, "\n");
+ fprintf(stderr, " %s route\n", ProgName);
+ fprintf(stderr, " Print the routing tables\n");
+ fprintf(stderr, " %s route add <host>[/<prefix>] [<nexthop> OR <iface>] [<metric>]\n", ProgName);
+ fprintf(stderr, " Add a new route\n");
+ fprintf(stderr, " %s route del <host>[/<prefix>]\n", ProgName);
+ fprintf(stderr, " %s route del <routenum>\n", ProgName);
+ fprintf(stderr, " Add a new route\n");
+ fprintf(stderr, "\n");
fprintf(stderr, "A note on Acess's IP Stack:\n");
fprintf(stderr, " Each interface corresponds to only one IP address (either IPv4\n");
fprintf(stderr, " or IPv6). A network device can have multiple interfaces bound\n");
dp = open(IPSTACK_ROOT"/routes", OPENFLAG_READ);
+ printf("Type\tNetwork \tGateway \tMetric\tIFace\n");
+
while( readdir(dp, filename) )
{
if(filename[0] == '.') continue;
fd = open(path, OPENFLAG_READ);
if(fd == -1) {
- printf("%s:\tUnable to open ('%s')\n", Name, path);
+ fprintf(stderr, "Bad interface name '%s' (%s does not exist)\t", Name, path);
return ;
}
int len = ioctl(fd, call_num, NULL);
char *buf = malloc(len+1);
ioctl(fd, call_num, buf);
- printf("'%s'\t", buf);
+ printf("'%s'\n", buf);
free(buf);
}
+ printf("\t");
// Get the address type
switch(type)
{
{
uint8_t ip[4];
int subnet;
- printf("IPv4\n");
+ printf("IPv4\t");
ioctl(fd, 5, ip); // Get IP Address
subnet = ioctl(fd, 7, NULL); // Get Subnet Bits
- printf("\tAddress: %i.%i.%i.%i/%i\n", ip[0], ip[1], ip[2], ip[3], subnet);
+ printf("%i.%i.%i.%i/%i\n", ip[0], ip[1], ip[2], ip[3], subnet);
}
break;
case 6: // IPv6
{
uint16_t ip[8];
int subnet;
- printf("IPv6\n");
+ printf("IPv6\t");
ioctl(fd, 5, ip); // Get IP Address
subnet = ioctl(fd, 7, NULL); // Get Subnet Bits
- printf("\t%x:%x:%x:%x:%x:%x:%x:%x/%i\n",
+ printf("%x:%x:%x:%x:%x:%x:%x:%x/%i\n",
ntohs(ip[0]), ntohs(ip[1]), ntohs(ip[2]), ntohs(ip[3]),
ntohs(ip[4]), ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]),
subnet);
printf("UNKNOWN (%i)\n", type);
break;
}
- printf("\n");
close(fd);
}
return ;
}
- type = ioctl(fd, 4, NULL);
-
- // Ignore -1 values
- if( type == -1 ) {
- return ;
- }
-
- printf("%s:\t", Name);
- {
- int call_num = ioctl(fd, 3, "get_interface");
- int len = ioctl(fd, call_num, NULL);
- char *buf = malloc(len+1);
- ioctl(fd, call_num, buf);
- printf("'%s'\t", buf);
- free(buf);
+ int ofs = 2;
+ type = atoi(Name);
+
+ int i;
+ int len = Net_GetAddressSize(type);
+ uint8_t net[len], gw[len];
+ int subnet, metric;
+ for( i = 0; i < len; i ++ ) {
+ char tmp[5] = "0x00";
+ tmp[2] = Name[ofs++];
+ tmp[3] = Name[ofs++];
+ net[i] = atoi(tmp);
}
+ ofs ++;
+ subnet = atoi(Name+ofs);
+ ofs ++;
+ metric = atoi(Name+ofs);
+ ioctl(fd, ioctl(fd, 3, "get_nexthop"), gw); // Get Gateway/NextHop
// Get the address type
switch(type)
printf("DISABLED\n");
break;
case 4: // IPv4
- {
- uint8_t net[4], addr[4];
- int subnet, metric;
- printf("IPv4\n");
- ioctl(fd, ioctl(fd, 3, "get_network"), net); // Get Network
- ioctl(fd, ioctl(fd, 3, "get_nexthop"), addr); // Get Gateway/NextHop
- subnet = ioctl(fd, ioctl(fd, 3, "getset_subnetbits"), NULL); // Get Subnet Bits
- metric = ioctl(fd, ioctl(fd, 3, "getset_metric"), NULL); // Get Subnet Bits
- printf("\tNetwork: %s/%i\n", Net_PrintAddress(4, net), subnet);
- printf("\tGateway: %s\n", Net_PrintAddress(4, addr));
- printf("\tMetric: %i\n", metric);
- }
+ printf("IPv4\t");
break;
case 6: // IPv6
- {
- uint16_t net[8], addr[8];
- int subnet, metric;
- printf("IPv6\n");
- ioctl(fd, ioctl(fd, 3, "get_network"), net); // Get Network
- ioctl(fd, ioctl(fd, 3, "get_nexthop"), addr); // Get Gateway/NextHop
- subnet = ioctl(fd, ioctl(fd, 3, "getset_subnetbits"), NULL); // Get Subnet Bits
- metric = ioctl(fd, ioctl(fd, 3, "getset_metric"), NULL); // Get Subnet Bits
- printf("\tNetwork: %s/%i\n", Net_PrintAddress(6, net), subnet);
- printf("\tGateway: %s\n", Net_PrintAddress(6, addr));
- printf("\tMetric: %i\n", metric);
- }
+ printf("IPv6\t");
break;
default: // Unknow
printf("UNKNOWN (%i)\n", type);
break;
}
+ printf("%s/%i\t", Net_PrintAddress(type, net), subnet);
+ printf("%s \t", Net_PrintAddress(type, gw));
+ printf("%i\t", metric);
+
+ // Interface
+ {
+ int call_num = ioctl(fd, 3, "get_interface");
+ int len = ioctl(fd, call_num, NULL);
+ char *buf = malloc(len+1);
+ ioctl(fd, call_num, buf);
+ printf("'%s'\t", buf);
+ free(buf);
+ }
+
printf("\n");
close(fd);
return ret;
}
-void AddRoute(const char *Interface, void *Dest, int MaskBits, void *NextHop)
+void AddRoute(const char *Interface, int AddressType, void *Dest, int MaskBits, int Metric, void *NextHop)
{
int fd;
int num;
- char tmp[sizeof(IPSTACK_ROOT"/routes/") + 5]; // enough for 4 digits
+ char *ifaceToFree = NULL;
- // Create route
- fd = open(IPSTACK_ROOT"/routes", 0);
- num = ioctl(fd, ioctl(fd, 3, "add_route"), (char*)Interface);
- close(fd);
+ // Get interface name
+ if( !Interface )
+ {
+ if( !NextHop ) {
+ fprintf(stderr,
+ "BUG: AddRoute(Interface=NULL,...,NextHop=NULL)\n"
+ "Only one should be NULL\n"
+ );
+ return ;
+ }
+
+ // Query for the interface name
+ Interface = ifaceToFree = Net_GetInterface(AddressType, NextHop);
+ }
+ // Check address type (if the interface was passed)
+ // - If we got the interface name, then it should be correct
+ else
+ {
+ char ifacePath[sizeof(IPSTACK_ROOT"/")+strlen(Interface)+1];
+
+ // Open interface
+ strcpy(ifacePath, IPSTACK_ROOT"/");
+ strcat(ifacePath, Interface);
+ fd = open(ifacePath, 0);
+ if( fd == -1 ) {
+ fprintf(stderr, "Error: Interface '%s' does not exist\n", Interface);
+ return ;
+ }
+ // Get and check type
+ num = ioctl(fd, ioctl(fd, 3, "getset_type"), NULL);
+ if( num != AddressType ) {
+ fprintf(stderr, "Error: Passed type does not match interface type (%i != %i)\n",
+ AddressType, num);
+ return ;
+ }
+
+ close(fd);
+ }
- // Open route
- sprintf(tmp, IPSTACK_ROOT"/routes/%i", num);
- fd = open(tmp, 0);
+ // Create route
+ int addrsize = Net_GetAddressSize(AddressType);
+ int len = snprintf(NULL, 0, "/Devices/ip/routes/%i::%i:%i", AddressType, MaskBits, Metric) + addrsize*2;
+ char path[len+1];
+ {
+ int i, ofs;
+ ofs = sprintf(path, "/Devices/ip/routes/%i:", AddressType);
+ for( i = 0; i < addrsize; i ++ )
+ sprintf(path+ofs+i*2, "%02x", ((uint8_t*)Dest)[i]);
+ ofs += addrsize*2;
+ sprintf(path+ofs, ":%i:%i", MaskBits, Metric);
+ }
+
+ fd = open(path, 0);
+ if( fd != -1 ) {
+ close(fd);
+ fprintf(stderr, "Unable to create route '%s', already exists\n", path);
+ return ;
+ }
+ fd = open(path, OPENFLAG_CREATE, 0);
+ if( fd == -1 ) {
+ fprintf(stderr, "Unable to create '%s'\n", path);
+ return ;
+ }
- ioctl(fd, ioctl(fd, 3, "set_network"), Dest);
- ioctl(fd, ioctl(fd, 3, "set_nexthop"), NextHop);
- ioctl(fd, ioctl(fd, 3, "getset_subnetbits"), &MaskBits);
+ if( NextHop )
+ ioctl(fd, ioctl(fd, 3, "set_nexthop"), NextHop);
+ ioctl(fd, ioctl(fd, 3, "set_interface"), (void*)Interface);
close(fd);
+ // Check if the interface name was allocated by us
+ if( ifaceToFree )
+ free(ifaceToFree);
}
/**
* \note Debugging HACK!
- * \brief Autoconfigure the specified device to 10.0.2.55/8 using
- * 10.0.2.1 as the gateway.
+ * \brief Autoconfigure the specified device to 10.0.2.55/24 using
+ * 10.0.2.2 as the gateway.
*/
int DoAutoConfig(const char *Device)
{
// Set routes
{
uint8_t net[4] = {0,0,0,0};
- AddRoute(path + sizeof(IPSTACK_ROOT), addr, subnet, net); // This interface
- AddRoute(path + sizeof(IPSTACK_ROOT), net, 0, gw); // Gateway
+ AddRoute(path + sizeof(IPSTACK_ROOT), 4, addr, subnet, DEFAULT_METRIC, net); // This interface
+ AddRoute(path + sizeof(IPSTACK_ROOT), 4, net, 0, DEFAULT_METRIC, gw); // Gateway
}
close(fd);
int tmp, fd, subnet;
// Parse IP Address
- type = ParseIPAddres(Address, addr, &subnet);
+ type = ParseIPAddress(Address, addr, &subnet);
if(type == 0) {
fprintf(stderr, "'%s' cannot be parsed as an IP address\n", Address);
return -1;
* \brief Parse an IP Address
* \return 0 for unknown, 4 for IPv4 and 6 for IPv6
*/
-int ParseIPAddres(const char *Address, uint8_t *Dest, int *SubnetBits)
+int ParseIPAddress(const char *Address, uint8_t *Dest, int *SubnetBits)
{
const char *p = Address;
if(val > 32) {
printf("Notice: Subnet size >32 (%i)\n", val);
}
- *SubnetBits = val;
+ if(SubnetBits) *SubnetBits = val;
}
if(Address[i] != '\0') {
//printf("EOS != '\\0', '%c'\n", Address[i]);
if(val > 128) {
printf("Notice: Subnet size >128 (%i)\n", val);
}
- *SubnetBits = val;
+ if(SubnetBits) *SubnetBits = val;
}
for( j = 0; j < split; j ++ )
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au