d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix channel parsing which was broken in r179958, the channel number may be

Browse Source 
suffixed with :flag and /width.
This commit is contained in:
Andrew Thompson 2008-08-14 03:49:14 +00:00
parent 7cdd50e189
commit 5c43e5f42d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=181722
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/ifconfig/ifieee80211.c
View File

@ -670,8 +670,10 @@ set80211channel(const char *val, int d, int s, const struct afswtch *rafp)
getchaninfo(s);
v = strtol(val, &ep, 10);
if (val[0] == '\0' || ep[0] != '\0' || errno == ERANGE)
errx(1, "invalid channel number");
if (val[0] == '\0' || val == ep || errno == ERANGE ||
/* channel may be suffixed with nothing, :flag, or /width */
(ep[0] != '\0' && ep[0] != ':' && ep[0] != '/'))
errx(1, "invalid channel specification");
flags = getchannelflags(val, v);
if (v > 255) { /* treat as frequency */
mapfreq(&chan, v, flags);