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

Define _PATH_VAREMPTY.

Browse Source 
Add a -b option to background immediatly.

Add support for 802.11 routing messages to "instantly" renegotiate
at lease when we associate with a new network.

Submitted by:	sam
This commit is contained in:
Brooks Davis 2005-06-07 04:26:14 +00:00
parent 50bd7c73f6
commit 2b19b6fca1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=147085
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sbin/dhclient/dhclient.c
View File

@ -1,4 +1,5 @@
/* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ /* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */
/* $FreeBSD$ */
/* /*
* Copyright 2004 Henning Brauer <henning@openbsd.org> * Copyright 2004 Henning Brauer <henning@openbsd.org>
@ -56,6 +57,12 @@
#include "dhcpd.h" #include "dhcpd.h"
#include "privsep.h" #include "privsep.h"
#include <net80211/ieee80211_freebsd.h>
#ifndef _PATH_VAREMPTY
#define _PATH_VAREMPTY "/var/empty"
#endif
#define PERIOD 0x2e #define PERIOD 0x2e
#define hyphenchar(c) ((c) == 0x2d) #define hyphenchar(c) ((c) == 0x2d)
#define bslashchar(c) ((c) == 0x5c) #define bslashchar(c) ((c) == 0x5c)
@ -236,6 +243,30 @@ routehandler(struct protocol *p)
ifan->ifan_index == ifi->index) ifan->ifan_index == ifi->index)
goto die; goto die;
break; break;
case RTM_IEEE80211:
ifan = (struct if_announcemsghdr *)rtm;
if (ifan->ifan_index != ifi->index)
break;
switch (ifan->ifan_what) {
case RTM_IEEE80211_ASSOC:
state_reboot(ifi);
break;
case RTM_IEEE80211_DISASSOC:
/*
* Clear existing state; transition to the init
* state and then wait for either a link down
* notification or an associate event.
*/
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;
break;
}
break;
default: default:
break; break;
} }
@ -255,14 +286,18 @@ main(int argc, char *argv[])
extern char *__progname; extern char *__progname;
int ch, fd, quiet = 0, i = 0; int ch, fd, quiet = 0, i = 0;
int pipe_fd[2]; int pipe_fd[2];
int immediate_daemon = 0;
struct passwd *pw; struct passwd *pw;
/* Initially, log errors to stderr as well as to syslogd. */ /* Initially, log errors to stderr as well as to syslogd. */
openlog(__progname, LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY); openlog(__progname, LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY);
setlogmask(LOG_UPTO(LOG_INFO)); setlogmask(LOG_UPTO(LOG_INFO));
while ((ch = getopt(argc, argv, "c:dl:qu")) != -1) while ((ch = getopt(argc, argv, "bc:dl:nqu")) != -1)
switch (ch) { switch (ch) {
case 'b':
immediate_daemon = 1;
break;
case 'c': case 'c':
path_dhclient_conf = optarg; path_dhclient_conf = optarg;
break; break;
@ -375,6 +410,9 @@ main(int argc, char *argv[])
setproctitle("%s", ifi->name); setproctitle("%s", ifi->name);
if (immediate_daemon)
go_daemon();
ifi->client->state = S_INIT; ifi->client->state = S_INIT;
state_reboot(ifi); state_reboot(ifi);