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

Defer state change on disassociate to avoid unnecessarily dropping the

Browse Source 
lease: track the current bssid and if it changes (as reported in an
assoc/reassoc) event only then kick the state machine.  This gives us
immediate response when roaming but otherwise causes us to fallback on
the normal state machine.

Reviewed by:	brooks, jhb
MFC after:	3 weeks
This commit is contained in:
Sam Leffler 2008-03-22 16:24:02 +00:00
parent 043f1935e0
commit 61063e478a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=177501
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sbin/dhclient/dhclient.c
View File

@ -176,7 +176,29 @@ get_ifa(char *cp, int n)
return (NULL); return (NULL);
} }
struct iaddr defaddr = { 4 }; struct iaddr defaddr = { 4 };
uint8_t curbssid[6];
static void
disassoc(void *arg)
{
struct interface_info *ifi = arg;
/*
* Clear existing state.
*/
if (ifi->client->active != NULL) {
script_init("EXPIRE", NULL);
script_write_params("old_",
ifi->client->active);
if (ifi->client->alias)
script_write_params("alias_",
ifi->client->alias);
script_go();
}
ifi->client->state = S_INIT;
}
/* ARGSUSED */ /* ARGSUSED */
void void
@ -187,6 +209,7 @@ routehandler(struct protocol *p)
struct if_msghdr *ifm; struct if_msghdr *ifm;
struct ifa_msghdr *ifam; struct ifa_msghdr *ifam;
struct if_announcemsghdr *ifan; struct if_announcemsghdr *ifan;
struct ieee80211_join_event *jev;
struct client_lease *l; struct client_lease *l;
time_t t = time(NULL); time_t t = time(NULL);
struct sockaddr *sa; struct sockaddr *sa;
@ -255,24 +278,17 @@ routehandler(struct protocol *p)
switch (ifan->ifan_what) { switch (ifan->ifan_what) {
case RTM_IEEE80211_ASSOC: case RTM_IEEE80211_ASSOC:
case RTM_IEEE80211_REASSOC: case RTM_IEEE80211_REASSOC:
state_reboot(ifi);
break;
case RTM_IEEE80211_DISASSOC:
/* /*
* Clear existing state; transition to the init * Use assoc/reassoc event to kick state machine
* state and then wait for either a link down * in case we roam. Otherwise fall back to the
* notification or an associate event. * normal state machine just like a wired network.
*/ */
if (ifi->client->active != NULL) { jev = (struct ieee80211_join_event *) &ifan[1];
script_init("EXPIRE", NULL); if (memcmp(curbssid, jev->iev_addr, 6)) {
script_write_params("old_", disassoc(ifi);
ifi->client->active); state_reboot(ifi);
if (ifi->client->alias)
script_write_params("alias_",
ifi->client->alias);
script_go();
} }
ifi->client->state = S_INIT; memcpy(curbssid, jev->iev_addr, 6);
break; break;
} }
break; break;