/*
* Wireless Tools
*
- * Jean II - HPLB '99
+ * Jean II - HPLB 97->99 - HPL 99->00
*
* Main code for "iwconfig". This is the generic tool for most
* manipulations...
- * You need to link this code against "iwcommon.c" and "-lm".
+ * You need to link this code against "iwlib.c" and "-lm".
+ *
+ * This file is released under the GPL license.
+ * Copyright (c) 1997-2002 Jean Tourrilhes <jt@hpl.hp.com>
*/
-#include "iwcommon.h" /* Header */
+#include "iwlib.h" /* Header */
+
+/**************************** CONSTANTS ****************************/
+
+static const char * argtype[] = {
+ " ", "byte", "char", "", "int ", "float" };
/************************* MISC SUBROUTINES **************************/
fprintf(stderr, "Usage: iwpriv interface [private-command [private-arguments]]\n");
fprintf(stderr, " interface [roam {on|off}]\n");
fprintf(stderr, " interface [port {ad-hoc|managed|N}]\n");
- exit(1);
}
/************************ GENERIC FUNCTIONS *************************/
* Print on the screen in a neat fashion all the info we have collected
* on a device.
*/
-static void
+static int
print_priv_info(int skfd,
- char * ifname)
+ char * ifname,
+ char * args[],
+ int count)
{
int k;
- iwprivargs priv[16];
+ iwprivargs priv[32];
int n;
- char * argtype[] = { " ", "byte", "char", "", "int", "float" };
+
+ /* Avoid "Unused parameter" warning */
+ args = args; count = count;
/* Read the private ioctls */
- n = get_priv_info(skfd, ifname, priv);
+ n = iw_get_priv_info(skfd, ifname, priv);
/* Is there any ? */
if(n <= 0)
else
{
printf("%-8.8s Available private ioctl :\n", ifname);
- /* Print the all */
+ /* Print them all */
for(k = 0; k < n; k++)
printf(" %s (%X) : set %3d %s & get %3d %s\n",
priv[k].name, priv[k].cmd,
argtype[(priv[k].get_args & IW_PRIV_TYPE_MASK) >> 12]);
printf("\n");
}
-}
-
-/*------------------------------------------------------------------*/
-/*
- * Get info on all devices and print it on the screen
- */
-static void
-print_priv_devices(int skfd)
-{
- char buff[1024];
- struct ifconf ifc;
- struct ifreq *ifr;
- int i;
-
- /* Get list of active devices */
- ifc.ifc_len = sizeof(buff);
- ifc.ifc_buf = buff;
- if(ioctl(skfd, SIOCGIFCONF, &ifc) < 0)
- {
- fprintf(stderr, "SIOCGIFCONF: %s\n", strerror(errno));
- return;
- }
- ifr = ifc.ifc_req;
-
- /* Print them */
- for(i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; ifr++)
- print_priv_info(skfd, ifr->ifr_name);
+ return(0);
}
/************************* SETTING ROUTINES **************************/
int k;
iwprivargs priv[16];
int number;
+ int temp;
/* Read the private ioctls */
- number = get_priv_info(skfd, ifname, priv);
+ number = iw_get_priv_info(skfd, ifname, priv);
/* Is there any ? */
if(number <= 0)
wrq.u.data.length = priv[k].set_args & IW_PRIV_SIZE_MASK;
/* Fetch args */
- for(; i < wrq.u.data.length + 1; i++)
- sscanf(args[i], "%d", (int *)(buffer + i - 1));
+ for(; i < wrq.u.data.length + 1; i++) {
+ sscanf(args[i], "%d", &temp);
+ buffer[i - 1] = (char) temp;
+ }
break;
case IW_PRIV_TYPE_INT:
strncpy(wrq.ifr_name, ifname, IFNAMSIZ);
if((priv[k].set_args & IW_PRIV_SIZE_FIXED) &&
- (byte_size(priv[k].set_args) < IFNAMSIZ))
+ (iw_byte_size(priv[k].set_args) < IFNAMSIZ))
memcpy(wrq.u.name, buffer, IFNAMSIZ);
else
{
printf("%-8.8s %s:", ifname, priv[k].name);
if((priv[k].get_args & IW_PRIV_SIZE_FIXED) &&
- (byte_size(priv[k].get_args) < IFNAMSIZ))
+ (iw_byte_size(priv[k].get_args) < IFNAMSIZ))
{
memcpy(buffer, wrq.u.name, IFNAMSIZ);
n = priv[k].get_args & IW_PRIV_SIZE_MASK;
case IW_PRIV_TYPE_INT:
/* Display args */
for(j = 0; j < n; j++)
- printf("%d ", ((u_int *) buffer)[i]);
+ printf("%d ", ((u_int *) buffer)[j]);
printf("\n");
break;
change roam states */
/* Read the private ioctls */
- number = get_priv_info(skfd, ifname, priv);
+ number = iw_get_priv_info(skfd, ifname, priv);
/* Is there any ? */
if(number <= 0)
}
if(count != 1)
- iw_usage();
+ {
+ iw_usage();
+ return(-1);
+ }
if(!strcasecmp(args[i], "on"))
{
if(ioctl(skfd, priv[k].cmd, &wrq) < 0)
{
fprintf(stderr, "Roaming support is broken.\n");
- exit(0);
+ return(-1);
}
}
- i++;
- return(i);
+ return(0);
}
/*------------------------------------------------------------------*/
char * modes[] = { "invalid", "managed (BSS)", "reserved", "ad-hoc" };
/* Read the private ioctls */
- number = get_priv_info(skfd, ifname, priv);
+ number = iw_get_priv_info(skfd, ifname, priv);
/* Is there any ? */
if(number <= 0)
}
if(count != 1)
- iw_usage();
+ {
+ iw_usage();
+ return(-1);
+ }
/* Read it */
/* As a string... */
else
/* ...or as an integer */
if(sscanf(args[i], "%d", (int *) &ptype) != 1)
- iw_usage();
+ {
+ iw_usage();
+ return(-1);
+ }
k = -1;
while((++k < number) && strcmp(priv[k].name, "sport_type") &&
if(ioctl(skfd, priv[k].cmd, &wrq) < 0)
{
fprintf(stderr, "Invalid port type (or setting not allowed)\n");
- exit(0);
+ return(-1);
}
- i++;
- return(i);
+ return(0);
}
/******************************* MAIN ********************************/
main(int argc,
char ** argv)
{
- int skfd = -1; /* generic raw socket desc. */
+ int skfd; /* generic raw socket desc. */
int goterr = 0;
/* Create a channel to the NET kernel. */
- if((skfd = sockets_open()) < 0)
+ if((skfd = iw_sockets_open()) < 0)
{
perror("socket");
- exit(-1);
+ return(-1);
}
/* No argument : show the list of all device + info */
if(argc == 1)
- {
- print_priv_devices(skfd);
- close(skfd);
- exit(0);
- }
-
- /* Special cases take one... */
- /* Help */
- if((!strncmp(argv[1], "-h", 9)) ||
- (!strcmp(argv[1], "--help")))
- {
+ iw_enum_devices(skfd, &print_priv_info, NULL, 0);
+ else
+ /* Special cases take one... */
+ /* Help */
+ if((!strncmp(argv[1], "-h", 9)) ||
+ (!strcmp(argv[1], "--help")))
iw_usage();
- close(skfd);
- exit(0);
- }
-
- /* The device name must be the first argument */
- /* Name only : show for that device only */
- if(argc == 2)
- {
- print_priv_info(skfd, argv[1]);
- close(skfd);
- exit(0);
- }
-
- /* Special cases take two... */
- /* Roaming */
- if(!strncmp(argv[2], "roam", 4))
- {
- goterr = set_roaming(skfd, argv + 3, argc - 3, argv[1]);
- close(skfd);
- exit(0);
- }
-
- /* Port type */
- if(!strncmp(argv[2], "port", 4))
- {
- goterr = port_type(skfd, argv + 3, argc - 3, argv[1]);
- close(skfd);
- exit(0);
- }
-
- /* Otherwise, it's a private ioctl */
- goterr = set_private(skfd, argv + 2, argc - 2, argv[1]);
+ else
+ /* The device name must be the first argument */
+ /* Name only : show for that device only */
+ if(argc == 2)
+ print_priv_info(skfd, argv[1], NULL, 0);
+ else
+ /* Special cases take two... */
+ /* Roaming */
+ if(!strncmp(argv[2], "roam", 4))
+ goterr = set_roaming(skfd, argv + 3, argc - 3, argv[1]);
+ else
+ /* Port type */
+ if(!strncmp(argv[2], "port", 4))
+ goterr = port_type(skfd, argv + 3, argc - 3, argv[1]);
+ else
+ /* Otherwise, it's a private ioctl */
+ goterr = set_private(skfd, argv + 2, argc - 2, argv[1]);
/* Close the socket. */
close(skfd);
- return(1);
+ return(goterr);
}