diff options
author | sam <sam@FreeBSD.org> | 2008-12-15 01:15:15 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2008-12-15 01:15:15 +0000 |
commit | 27870a75c93744cf4be14640807156cbb017a533 (patch) | |
tree | 567ae086531551c06ba65a98501b1a6875f6a1f2 /sbin/ifconfig | |
parent | c5b85460d4aca5bf3ac8ecf8537e2dd2c7532a86 (diff) | |
download | FreeBSD-src-27870a75c93744cf4be14640807156cbb017a533.zip FreeBSD-src-27870a75c93744cf4be14640807156cbb017a533.tar.gz |
move channel parsing to a getchannel routine so it can be reused to check
the channel argument supplied to chanswitch
Diffstat (limited to 'sbin/ifconfig')
-rw-r--r-- | sbin/ifconfig/ifieee80211.c | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 5a0fa69..d496644 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -664,30 +664,38 @@ getchannelflags(const char *val, int freq) } static void -set80211channel(const char *val, int d, int s, const struct afswtch *rafp) +getchannel(int s, struct ieee80211_channel *chan, const char *val) { - struct ieee80211_channel chan; - - memset(&chan, 0, sizeof(chan)); - if (!isanyarg(val)) { - int v, flags; - char *ep; + int v, flags; + char *eptr; - getchaninfo(s); - v = strtol(val, &ep, 10); - 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); - } else { - mapchan(&chan, v, flags); - } + memset(chan, 0, sizeof(*chan)); + if (isanyarg(val)) { + chan->ic_freq = IEEE80211_CHAN_ANY; + return; + } + getchaninfo(s); + errno = 0; + v = strtol(val, &eptr, 10); + if (val[0] == '\0' || val == eptr || errno == ERANGE || + /* channel may be suffixed with nothing, :flag, or /width */ + (eptr[0] != '\0' && eptr[0] != ':' && eptr[0] != '/')) + errx(1, "invalid channel specification%s", + errno == ERANGE ? " (out of range)" : ""); + flags = getchannelflags(val, v); + if (v > 255) { /* treat as frequency */ + mapfreq(chan, v, flags); } else { - chan.ic_freq = IEEE80211_CHAN_ANY; + mapchan(chan, v, flags); } +} + +static void +set80211channel(const char *val, int d, int s, const struct afswtch *rafp) +{ + struct ieee80211_channel chan; + + getchannel(s, &chan, val); set80211(s, IEEE80211_IOC_CURCHAN, 0, sizeof(chan), &chan); } @@ -695,17 +703,8 @@ static void set80211chanswitch(const char *val, int d, int s, const struct afswtch *rafp) { struct ieee80211_chanswitch_req csr; - int v, flags; - memset(&csr, 0, sizeof(csr)); - getchaninfo(s); - v = atoi(val); - flags = getchannelflags(val, v); - if (v > 255) { /* treat as frequency */ - mapfreq(&csr.csa_chan, v, flags); - } else { - mapchan(&csr.csa_chan, v, flags); - } + getchannel(s, &csr.csa_chan, val); csr.csa_mode = 1; csr.csa_count = 5; set80211(s, IEEE80211_IOC_CHANSWITCH, 0, sizeof(csr), &csr); |