d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96c95412ca
freebsd-nq/sbin/devd/devd.cc

1071 lines
21 KiB
C++
Raw Normal View History

MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
/*-
Expand system into my_system, and add the necessary tidyness that we need. Close the pidfile. Then close all descriptors >= 3 to avoid information leakage to children. This solves the problem of not being able to restart devd when you have, for example, a dhclient forked to configure your network... MFC after: 3 days
2010-06-29 03:52:12 +00:00
* Copyright (c) 2002-2010 M. Warner Losh.
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
Expand system into my_system, and add the necessary tidyness that we need. Close the pidfile. Then close all descriptors >= 3 to avoid information leakage to children. This solves the problem of not being able to restart devd when you have, for example, a dhclient forked to configure your network... MFC after: 3 days
2010-06-29 03:52:12 +00:00
*
* my_system is a variation on lib/libc/stdlib/system.c:
*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
*/
/*
* DEVD control daemon.
*/
// TODO list:
// o devd.conf and devd man pages need a lot of help:
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
// - devd needs to document the unix domain socket
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
// - devd.conf needs more details on the supported statements.
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
#include <sys/socket.h>
#include <sys/stat.h>
Put an anti-foot-shooting measure in place. Set hw.bus.devctl_disable to 0 when we startup. Print a warning in this case. This allows people that are playing with devd by hand to have something happen. Otherwise, it appears that devd isn't working because /dev/devctl is disabled and producing no events. Suggested by: peter on irc a long time ago.
2003-04-21 04:30:12 +00:00
#include <sys/sysctl.h>
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
#include <sys/types.h>
Expand system into my_system, and add the necessary tidyness that we need. Close the pidfile. Then close all descriptors >= 3 to avoid information leakage to children. This solves the problem of not being able to restart devd when you have, for example, a dhclient forked to configure your network... MFC after: 3 days
2010-06-29 03:52:12 +00:00
#include <sys/wait.h>
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
#include <sys/un.h>
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
#include <ctype.h>
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
#include <dirent.h>
#include <errno.h>
#include <err.h>
#include <fcntl.h>
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
#include <libutil.h>
Expand system into my_system, and add the necessary tidyness that we need. Close the pidfile. Then close all descriptors >= 3 to avoid information leakage to children. This solves the problem of not being able to restart devd when you have, for example, a dhclient forked to configure your network... MFC after: 3 days
2010-06-29 03:52:12 +00:00
#include <paths.h>
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
#include <regex.h>
Ignore sigpipe so we can properly detach clients to the pipe. Submitted by: Fredrik Lindberg
2005-05-16 20:51:46 +00:00
#include <signal.h>
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
#include <algorithm>
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
#include <map>
#include <string>
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
#include <list>
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
#include <vector>
Create a new C++ header file called devd.hh which has all the class definitions in it. Begin to document the classes that we use, and how they interrelate (using comments that I can use with doxygen to automatically generate docs with).
2003-04-26 20:59:04 +00:00
#include "devd.h" /* C compatible definitions */
#include "devd.hh" /* C++ class definitions */
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
#define PIPE "/var/run/devd.pipe"
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
#define CF "/etc/devd.conf"
Put an anti-foot-shooting measure in place. Set hw.bus.devctl_disable to 0 when we startup. Print a warning in this case. This allows people that are playing with devd by hand to have something happen. Otherwise, it appears that devd isn't working because /dev/devctl is disabled and producing no events. Suggested by: peter on irc a long time ago.
2003-04-21 04:30:12 +00:00
#define SYSCTL "hw.bus.devctl_disable"
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
using namespace std;
extern FILE *yyin;
extern int lineno;
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
static const char notify = '!';
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
static const char nomatch = '?';
static const char attach = '+';
static const char detach = '-';
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
static struct pidfh *pfh;
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
int Dflag;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
int dflag;
Change default to be 'process all events before calling daemon.' Also, put a small work around into devd to prevent a hang on boot this would cause because select used to return 2 rather than 0 for no evetnts due to a bug I fixed a few days ago in subr_bus.c. I'll remove this workaround May 7th. You have until then to upgrade your kernel if you want to run a new devd with an older kernel.
2003-04-25 02:13:42 +00:00
int nflag;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
int romeo_must_die = 0;
Add a -f configfile option to devd(8), based on a patch submitted by Wojciech A. Koszek. Submitted by: Wojciech A. Koszek <dunstan@freebsd.czest.pl>
2005-11-24 14:39:41 +00:00
static const char *configfile = CF;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
static void event_loop(void);
static void usage(void);
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
template <class T> void
delete_and_clear(vector<T *> &v)
{
typename vector<T *>::const_iterator i;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (i = v.begin(); i != v.end(); ++i)
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
delete *i;
v.clear();
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
config cfg;
event_proc::event_proc() : _prio(-1)
{
// nothing
}
event_proc::~event_proc()
{
Reuse delete_and_clear() template helper. Approved by: imp
2005-11-14 02:01:10 +00:00
delete_and_clear(_epsvec);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
void
event_proc::add(eps *eps)
{
_epsvec.push_back(eps);
}
bool
Constify where possible Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:14 +00:00
event_proc::matches(config &c) const
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
{
vector<eps *>::const_iterator i;
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (i = _epsvec.begin(); i != _epsvec.end(); ++i)
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
if (!(*i)->do_match(c))
return (false);
return (true);
}
bool
Constify where possible Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:14 +00:00
event_proc::run(config &c) const
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
{
vector<eps *>::const_iterator i;
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (i = _epsvec.begin(); i != _epsvec.end(); ++i)
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
if (!(*i)->do_action(c))
return (false);
return (true);
}
action::action(const char *cmd)
: _cmd(cmd)
{
// nothing
}
action::~action()
{
// nothing
}
Expand system into my_system, and add the necessary tidyness that we need. Close the pidfile. Then close all descriptors >= 3 to avoid information leakage to children. This solves the problem of not being able to restart devd when you have, for example, a dhclient forked to configure your network... MFC after: 3 days
2010-06-29 03:52:12 +00:00
static int
my_system(const char *command)
{
pid_t pid, savedpid;
int pstat;
struct sigaction ign, intact, quitact;
sigset_t newsigblock, oldsigblock;
if (!command) /* just checking... */
return(1);
/*
* Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save
* existing signal dispositions.
*/
ign.sa_handler = SIG_IGN;
::sigemptyset(&ign.sa_mask);
ign.sa_flags = 0;
::sigaction(SIGINT, &ign, &intact);
::sigaction(SIGQUIT, &ign, &quitact);
::sigemptyset(&newsigblock);
::sigaddset(&newsigblock, SIGCHLD);
::sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
switch (pid = ::fork()) {
case -1: /* error */
break;
case 0: /* child */
/*
* Restore original signal dispositions and exec the command.
*/
::sigaction(SIGINT, &intact, NULL);
::sigaction(SIGQUIT, &quitact, NULL);
::sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
/*
* Close the PID file, and all other open descriptors.
* Inherit std{in,out,err} only.
*/
cfg.close_pidfile();
::closefrom(3);
::execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL);
::_exit(127);
default: /* parent */
savedpid = pid;
do {
pid = ::wait4(savedpid, &pstat, 0, (struct rusage *)0);
} while (pid == -1 && errno == EINTR);
break;
}
::sigaction(SIGINT, &intact, NULL);
::sigaction(SIGQUIT, &quitact, NULL);
::sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
return (pid == -1 ? -1 : pstat);
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
bool
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
action::do_action(config &c)
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
{
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
string s = c.expand_string(_cmd);
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
fprintf(stderr, "Executing '%s'\n", s.c_str());
Expand system into my_system, and add the necessary tidyness that we need. Close the pidfile. Then close all descriptors >= 3 to avoid information leakage to children. This solves the problem of not being able to restart devd when you have, for example, a dhclient forked to configure your network... MFC after: 3 days
2010-06-29 03:52:12 +00:00
my_system(s.c_str());
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
return (true);
}
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
match::match(config &c, const char *var, const char *re)
Prefer the use of initalizer lists to ctor assignment. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:21 +00:00
: _var(var), _re("^")
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
{
- Add support for a "!" character in regex matching in devd(8). It inverts the logic (true/false) of the matching. - Add "!usbus[0-9]+" to IFNET ATTACH notification handler in the default devd.conf to prevent rc.d/netif from running when usbus[0-9]+ is attached. Reviewed by: imp
2011-10-26 02:11:28 +00:00
if (!c.expand_string(string(re)).empty() &&
c.expand_string(string(re)).at(0) == '!') {
_re.append(c.expand_string(string(re)).substr(1));
_inv = 1;
} else {
_re.append(c.expand_string(string(re)));
_inv = 0;
}
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
_re.append("$");
It was always intended that regular expression matching be case insensitive. Make it so.
2006-01-08 05:18:36 +00:00
regcomp(&_regex, _re.c_str(), REG_EXTENDED | REG_NOSUB | REG_ICASE);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
match::~match()
{
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
regfree(&_regex);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
bool
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
match::do_match(config &c)
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
{
- Avoid calling the copy constructor when it is not necessary.
2010-07-29 16:06:40 +00:00
const string &value = c.get_variable(_var);
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
bool retval;
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
- Add support for a "!" character in regex matching in devd(8). It inverts the logic (true/false) of the matching. - Add "!usbus[0-9]+" to IFNET ATTACH notification handler in the default devd.conf to prevent rc.d/netif from running when usbus[0-9]+ is attached. Reviewed by: imp
2011-10-26 02:11:28 +00:00
fprintf(stderr, "Testing %s=%s against %s, invert=%d\n",
_var.c_str(), value.c_str(), _re.c_str(), _inv);
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
retval = (regexec(&_regex, value.c_str(), 0, NULL, 0) == 0);
- Add support for a "!" character in regex matching in devd(8). It inverts the logic (true/false) of the matching. - Add "!usbus[0-9]+" to IFNET ATTACH notification handler in the default devd.conf to prevent rc.d/netif from running when usbus[0-9]+ is attached. Reviewed by: imp
2011-10-26 02:11:28 +00:00
if (_inv == 1)
retval = (retval == 0) ? 1 : 0;
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
return retval;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
Add the ability to match the on a media type of the device in question. Submitted by: sam Approved by: re (scottl)
2005-07-10 03:37:15 +00:00
#include <sys/sockio.h>
#include <net/if.h>
#include <net/if_media.h>
Make devd WARNS=4 clean and bump WARNS accordingly. This will insure that future variable shadowing bugs don't compile. Reviewed by: imp Compiled on: alpha i386 sparc64
2005-10-19 21:21:22 +00:00
media::media(config &, const char *var, const char *type)
Add the ability to match the on a media type of the device in question. Submitted by: sam Approved by: re (scottl)
2005-07-10 03:37:15 +00:00
: _var(var), _type(-1)
{
static struct ifmedia_description media_types[] = {
{ IFM_ETHER, "Ethernet" },
{ IFM_TOKEN, "Tokenring" },
{ IFM_FDDI, "FDDI" },
{ IFM_IEEE80211, "802.11" },
{ IFM_ATM, "ATM" },
{ -1, "unknown" },
{ 0, NULL },
};
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (int i = 0; media_types[i].ifmt_string != NULL; ++i)
Add the ability to match the on a media type of the device in question. Submitted by: sam Approved by: re (scottl)
2005-07-10 03:37:15 +00:00
if (strcasecmp(type, media_types[i].ifmt_string) == 0) {
_type = media_types[i].ifmt_word;
break;
}
}
media::~media()
{
}
bool
media::do_match(config &c)
{
media-type predicate is used in contexts where device-name is undefined. In those contexted, use subsystem instead. # This causes dhclient to run again when I plug in my ethernet cable to # my fxp card in my laptop.
2005-10-04 22:22:51 +00:00
string value;
Add the ability to match the on a media type of the device in question. Submitted by: sam Approved by: re (scottl)
2005-07-10 03:37:15 +00:00
struct ifmediareq ifmr;
bool retval;
int s;
media-type predicate is used in contexts where device-name is undefined. In those contexted, use subsystem instead. # This causes dhclient to run again when I plug in my ethernet cable to # my fxp card in my laptop.
2005-10-04 22:22:51 +00:00
// Since we can be called from both a device attach/detach
// context where device-name is defined and what we want,
// as well as from a link status context, where subsystem is
// the name of interest, first try device-name and fall back
// to subsystem if none exists.
value = c.get_variable("device-name");
if (value.length() == 0)
As pointed out on current@, we don't want to declare a variable in a scope that just uses the variable and throws it away. This should fix the subsystem keyword wrt media-type. MFC After: 2 days
2005-10-19 18:10:34 +00:00
value = c.get_variable("subsystem");
Add the ability to match the on a media type of the device in question. Submitted by: sam Approved by: re (scottl)
2005-07-10 03:37:15 +00:00
if (Dflag)
fprintf(stderr, "Testing media type of %s against 0x%x\n",
value.c_str(), _type);
retval = false;
s = socket(PF_INET, SOCK_DGRAM, 0);
if (s >= 0) {
memset(&ifmr, 0, sizeof(ifmr));
strncpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name));
if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0 &&
ifmr.ifm_status & IFM_AVALID) {
if (Dflag)
fprintf(stderr, "%s has media type 0x%x\n",
value.c_str(), IFM_TYPE(ifmr.ifm_active));
retval = (IFM_TYPE(ifmr.ifm_active) == _type);
} else if (_type == -1) {
if (Dflag)
fprintf(stderr, "%s has unknown media type\n",
value.c_str());
retval = true;
}
close(s);
}
return retval;
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
const string var_list::bogus = "_$_$_$_$_B_O_G_U_S_$_$_$_$_";
const string var_list::nothing = "";
const string &
var_list::get_variable(const string &var) const
{
map<string, string>::const_iterator i;
i = _vars.find(var);
if (i == _vars.end())
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
return (var_list::bogus);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
return (i->second);
}
bool
var_list::is_set(const string &var) const
{
return (_vars.find(var) != _vars.end());
}
void
var_list::set_variable(const string &var, const string &val)
{
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
Fix parsing of nomatch events. minor debug fix.
2005-04-18 02:54:07 +00:00
fprintf(stderr, "setting %s=%s\n", var.c_str(), val.c_str());
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
_vars[var] = val;
}
void
config::reset(void)
{
_dir_list.clear();
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
delete_and_clear(_var_list_table);
delete_and_clear(_attach_list);
delete_and_clear(_detach_list);
delete_and_clear(_nomatch_list);
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
delete_and_clear(_notify_list);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
void
config::parse_one_file(const char *fn)
{
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
Send all debug to stderr.
2008-12-14 11:48:51 +00:00
fprintf(stderr, "Parsing %s\n", fn);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
yyin = fopen(fn, "r");
if (yyin == NULL)
err(1, "Cannot open config file %s", fn);
o Yacc's lineno variable holds a total number of parsed lines. Reset it to 1 for each devd config file so if the parser finds a syntax error devd(8) will report a correct line number. Submitted by: Niki Denev MFC after: 2 weeks
2006-04-14 07:20:42 +00:00
lineno = 1;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
if (yyparse() != 0)
errx(1, "Cannot parse %s at line %d", fn, lineno);
fclose(yyin);
}
void
config::parse_files_in_dir(const char *dirname)
{
DIR *dirp;
struct dirent *dp;
char path[PATH_MAX];
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
Send all debug to stderr.
2008-12-14 11:48:51 +00:00
fprintf(stderr, "Parsing files in %s\n", dirname);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
dirp = opendir(dirname);
if (dirp == NULL)
return;
readdir(dirp); /* Skip . */
readdir(dirp); /* Skip .. */
while ((dp = readdir(dirp)) != NULL) {
if (strcmp(dp->d_name + dp->d_namlen - 5, ".conf") == 0) {
snprintf(path, sizeof(path), "%s/%s",
dirname, dp->d_name);
parse_one_file(path);
}
}
Fix missing closedir() Reviewed by: imp
2010-11-21 04:02:37 +00:00
closedir(dirp);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
class epv_greater {
public:
Constify where possible Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:14 +00:00
int operator()(event_proc *const&l1, event_proc *const&l2) const
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
{
return (l1->get_priority() > l2->get_priority());
}
};
void
config::sort_vector(vector<event_proc *> &v)
{
Fix an old bug in devd, where it uses std::sort() to sort the various lists it reads from its configuration files on the priority field. Because some items in the lists have the same priority, and std::sort() is not stable, the exact order in which the items are enumerated does not have to correspond to the order they appear in the configuration files. Apparently this was never noticed with libstdc++, but with libc++ it could cause the "uhid" entry from /etc/devd/usb.conf to be used instead of the "ums" entry (which is earlier in the file). This caused the problem described in the PR: the USB mouse module was never loaded, and the other actions (such as starting moused) were not executed. To fix the problem, make devd use std:stable_sort() instead. Reported by: Jan Beich <jbeich@tormail.org> PR: bin/172958 MFC after: 2 weeks
2012-12-05 20:50:40 +00:00
stable_sort(v.begin(), v.end(), epv_greater());
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
void
config::parse(void)
{
vector<string>::const_iterator i;
Add a -f configfile option to devd(8), based on a patch submitted by Wojciech A. Koszek. Submitted by: Wojciech A. Koszek <dunstan@freebsd.czest.pl>
2005-11-24 14:39:41 +00:00
parse_one_file(configfile);
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (i = _dir_list.begin(); i != _dir_list.end(); ++i)
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
parse_files_in_dir((*i).c_str());
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
sort_vector(_attach_list);
sort_vector(_detach_list);
sort_vector(_nomatch_list);
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
sort_vector(_notify_list);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
void
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
config::open_pidfile()
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
{
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
pid_t otherpid;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
if (_pidfile == "")
return;
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
pfh = pidfile_open(_pidfile.c_str(), 0600, &otherpid);
if (pfh == NULL) {
if (errno == EEXIST)
errx(1, "devd already running, pid: %d", (int)otherpid);
warn("cannot open pid file");
}
}
void
config::write_pidfile()
{
pidfile_write(pfh);
}
Expand system into my_system, and add the necessary tidyness that we need. Close the pidfile. Then close all descriptors >= 3 to avoid information leakage to children. This solves the problem of not being able to restart devd when you have, for example, a dhclient forked to configure your network... MFC after: 3 days
2010-06-29 03:52:12 +00:00
void
config::close_pidfile()
{
pidfile_close(pfh);
}
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
void
config::remove_pidfile()
{
pidfile_remove(pfh);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
void
config::add_attach(int prio, event_proc *p)
{
p->set_priority(prio);
_attach_list.push_back(p);
}
void
config::add_detach(int prio, event_proc *p)
{
p->set_priority(prio);
_detach_list.push_back(p);
}
void
config::add_directory(const char *dir)
{
_dir_list.push_back(string(dir));
}
void
config::add_nomatch(int prio, event_proc *p)
{
p->set_priority(prio);
_nomatch_list.push_back(p);
}
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
void
config::add_notify(int prio, event_proc *p)
{
p->set_priority(prio);
_notify_list.push_back(p);
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
void
config::set_pidfile(const char *fn)
{
_pidfile = string(fn);
}
void
config::push_var_table()
{
var_list *vl;
vl = new var_list();
_var_list_table.push_back(vl);
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
fprintf(stderr, "Pushing table\n");
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
void
config::pop_var_table()
{
delete _var_list_table.back();
_var_list_table.pop_back();
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
fprintf(stderr, "Popping table\n");
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
void
config::set_variable(const char *var, const char *val)
{
_var_list_table.back()->set_variable(var, val);
}
const string &
config::get_variable(const string &var)
{
vector<var_list *>::reverse_iterator i;
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (i = _var_list_table.rbegin(); i != _var_list_table.rend(); ++i) {
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
if ((*i)->is_set(var))
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
return ((*i)->get_variable(var));
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
return (var_list::nothing);
}
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
bool
Constify where possible Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:14 +00:00
config::is_id_char(char ch) const
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
{
return (ch != '\0' && (isalpha(ch) || isdigit(ch) || ch == '_' ||
ch == '-'));
}
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
void
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
config::expand_one(const char *&src, string &dst)
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
{
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
int count;
- Avoid calling the copy constructor when it is not necessary.
2010-07-29 16:06:40 +00:00
string buffer;
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
src++;
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
// $$ -> $
if (*src == '$') {
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
dst.append(src++, 1);
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
return;
}
// $(foo) -> $(foo)
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
// Not sure if I want to support this or not, so for now we just pass
// it through.
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
if (*src == '(') {
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
dst.append("$");
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
count = 1;
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
/* If the string ends before ) is matched , return. */
while (count > 0 && *src) {
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
if (*src == ')')
count--;
else if (*src == '(')
count++;
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
dst.append(src++, 1);
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
}
return;
}
// ${^A-Za-z] -> $\1
if (!isalpha(*src)) {
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
dst.append("$");
dst.append(src++, 1);
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
return;
}
// $var -> replace with value
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
do {
buffer.append(src++, 1);
Update to use is_id_char() in the last patch. I should have done this before the last commit.
2003-04-26 20:25:40 +00:00
} while (is_id_char(*src));
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
buffer.append("", 1);
- Avoid calling the copy constructor when it is not necessary.
2010-07-29 16:06:40 +00:00
dst.append(get_variable(buffer.c_str()));
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
}
const string
config::expand_string(const string &s)
{
const char *src;
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
string dst;
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
src = s.c_str();
while (*src) {
if (*src == '$')
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
expand_one(src, dst);
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
else
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
dst.append(src++, 1);
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
}
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
dst.append("", 1);
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
Make better use of the string type when parsing things. This switches expand one from using a fixed buffer to using a string which dynamically allocates these things. Submitted by: green@ (against an earlier version of devd) Ignored for too long by: imp
2003-04-26 19:44:45 +00:00
return (dst);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
bool
config::chop_var(char *&buffer, char *&lhs, char *&rhs)
{
char *walker;
if (*buffer == '\0')
return (false);
walker = lhs = buffer;
while (is_id_char(*walker))
walker++;
if (*walker != '=')
return (false);
walker++; // skip =
if (*walker == '"') {
walker++; // skip "
rhs = walker;
while (*walker && *walker != '"')
walker++;
if (*walker != '"')
return (false);
rhs[-2] = '\0';
*walker++ = '\0';
} else {
rhs = walker;
while (*walker && !isspace(*walker))
walker++;
if (*walker != '\0')
*walker++ = '\0';
rhs[-1] = '\0';
}
o Skip white space between variables better. This makes 'a="b" c="d" at loc=1 on busN' properly set 'c' and process the rest of the stirng. Before it would ignore everything after variable 'a'. o Parse nomatch and other events differently. They are more different than the code allowed for, so we weren't properly parsing nomatch events. It appears this fixes some of the demand loading issues that I was having with devd. Noticed by: Gary Palmer
2003-04-21 04:00:01 +00:00
while (isspace(*walker))
walker++;
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
buffer = walker;
return (true);
}
char *
config::set_vars(char *buffer)
{
char *lhs;
char *rhs;
while (1) {
if (!chop_var(buffer, lhs, rhs))
break;
set_variable(lhs, rhs);
}
return (buffer);
}
void
config::find_and_execute(char type)
{
vector<event_proc *> *l;
vector<event_proc *>::const_iterator i;
Make devd WARNS=4 clean and bump WARNS accordingly. This will insure that future variable shadowing bugs don't compile. Reviewed by: imp Compiled on: alpha i386 sparc64
2005-10-19 21:21:22 +00:00
const char *s;
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
switch (type) {
default:
return;
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
case notify:
l = &_notify_list;
s = "notify";
break;
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
case nomatch:
l = &_nomatch_list;
s = "nomatch";
break;
case attach:
l = &_attach_list;
s = "attach";
break;
case detach:
l = &_detach_list;
s = "detach";
break;
}
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
fprintf(stderr, "Processing %s event\n", s);
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (i = l->begin(); i != l->end(); ++i) {
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
if ((*i)->matches(*this)) {
(*i)->run(*this);
break;
}
}
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
static void
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
process_event(char *buffer)
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
{
char type;
char *sp;
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
sp = buffer + 1;
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
fprintf(stderr, "Processing event '%s'\n", buffer);
type = *buffer++;
cfg.push_var_table();
// No match doesn't have a device, and the format is a little
// different, so handle it separately.
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
switch (type) {
case notify:
sp = cfg.set_vars(sp);
break;
case nomatch:
Fix parsing of nomatch events. minor debug fix.
2005-04-18 02:54:07 +00:00
//? at location pnp-info on bus
sp = strchr(sp, ' ');
if (sp == NULL)
return; /* Can't happen? */
*sp++ = '\0';
Allow the kernel to generate more spacy things and still have devd cope. Skip multiple spaces in a few contexts. PR: 96854 Submitted by: Shin'ya Kumabuchi MFC after: 1 week
2010-10-09 07:29:13 +00:00
while (isspace(*sp))
sp++;
o Skip white space between variables better. This makes 'a="b" c="d" at loc=1 on busN' properly set 'c' and process the rest of the stirng. Before it would ignore everything after variable 'a'. o Parse nomatch and other events differently. They are more different than the code allowed for, so we weren't properly parsing nomatch events. It appears this fixes some of the demand loading issues that I was having with devd. Noticed by: Gary Palmer
2003-04-21 04:00:01 +00:00
if (strncmp(sp, "at ", 3) == 0)
sp += 3;
sp = cfg.set_vars(sp);
Allow the kernel to generate more spacy things and still have devd cope. Skip multiple spaces in a few contexts. PR: 96854 Submitted by: Shin'ya Kumabuchi MFC after: 1 week
2010-10-09 07:29:13 +00:00
while (isspace(*sp))
sp++;
o Skip white space between variables better. This makes 'a="b" c="d" at loc=1 on busN' properly set 'c' and process the rest of the stirng. Before it would ignore everything after variable 'a'. o Parse nomatch and other events differently. They are more different than the code allowed for, so we weren't properly parsing nomatch events. It appears this fixes some of the demand loading issues that I was having with devd. Noticed by: Gary Palmer
2003-04-21 04:00:01 +00:00
if (strncmp(sp, "on ", 3) == 0)
cfg.set_variable("bus", sp + 3);
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
break;
case attach: /*FALLTHROUGH*/
case detach:
sp = strchr(sp, ' ');
if (sp == NULL)
return; /* Can't happen? */
*sp++ = '\0';
cfg.set_variable("device-name", buffer);
Allow the kernel to generate more spacy things and still have devd cope. Skip multiple spaces in a few contexts. PR: 96854 Submitted by: Shin'ya Kumabuchi MFC after: 1 week
2010-10-09 07:29:13 +00:00
while (isspace(*sp))
sp++;
o Skip white space between variables better. This makes 'a="b" c="d" at loc=1 on busN' properly set 'c' and process the rest of the stirng. Before it would ignore everything after variable 'a'. o Parse nomatch and other events differently. They are more different than the code allowed for, so we weren't properly parsing nomatch events. It appears this fixes some of the demand loading issues that I was having with devd. Noticed by: Gary Palmer
2003-04-21 04:00:01 +00:00
if (strncmp(sp, "at ", 3) == 0)
sp += 3;
sp = cfg.set_vars(sp);
Allow the kernel to generate more spacy things and still have devd cope. Skip multiple spaces in a few contexts. PR: 96854 Submitted by: Shin'ya Kumabuchi MFC after: 1 week
2010-10-09 07:29:13 +00:00
while (isspace(*sp))
sp++;
o Skip white space between variables better. This makes 'a="b" c="d" at loc=1 on busN' properly set 'c' and process the rest of the stirng. Before it would ignore everything after variable 'a'. o Parse nomatch and other events differently. They are more different than the code allowed for, so we weren't properly parsing nomatch events. It appears this fixes some of the demand loading issues that I was having with devd. Noticed by: Gary Palmer
2003-04-21 04:00:01 +00:00
if (strncmp(sp, "on ", 3) == 0)
cfg.set_variable("bus", sp + 3);
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
break;
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
}
o Skip white space between variables better. This makes 'a="b" c="d" at loc=1 on busN' properly set 'c' and process the rest of the stirng. Before it would ignore everything after variable 'a'. o Parse nomatch and other events differently. They are more different than the code allowed for, so we weren't properly parsing nomatch events. It appears this fixes some of the demand loading issues that I was having with devd. Noticed by: Gary Palmer
2003-04-21 04:00:01 +00:00
MFp4: make it work o Expand variables correctly. o Set variables for each event. o rewrite event loop to execute the commands in the config file, rather than the hard wired generic command o better(?) debug when running -d o sort vectors of actions so that we just have to search for the first one to match rather than the best one that matches. o better attempts to clear all resources used on 'restart' o Remove now bogus comments MFC After: 1 centiyear
2003-01-06 08:09:41 +00:00
cfg.find_and_execute(type);
cfg.pop_var_table();
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
int
create_socket(const char *name)
{
int fd, slen;
struct sockaddr_un sun;
if ((fd = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0)
err(1, "socket");
bzero(&sun, sizeof(sun));
sun.sun_family = AF_UNIX;
strlcpy(sun.sun_path, name, sizeof(sun.sun_path));
slen = SUN_LEN(&sun);
unlink(name);
* Open permissions on /var/run/devd.pipe so that any user can read devd events from this socket * Enable non-blocking I/O on devd.pipe to keep clients from wedging devd. If a write(2) on devd.pipe would block, the client in question will be removed [1] Requested by: rwatson [1] Approved by: imp
2005-07-13 17:28:11 +00:00
if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
err(1, "fcntl");
Make devd build with libc++. MFC after: 3 days
2012-06-01 06:56:35 +00:00
if (::bind(fd, (struct sockaddr *) & sun, slen) < 0)
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
err(1, "bind");
listen(fd, 4);
Replace fch{mod,own} with straight ch{mod,own} as the former cannot be used on socket file descriptors. Reviewed by: secteam (cperciva) Approved by: imp
2005-07-13 17:10:47 +00:00
chown(name, 0, 0); /* XXX - root.wheel */
* Open permissions on /var/run/devd.pipe so that any user can read devd events from this socket * Enable non-blocking I/O on devd.pipe to keep clients from wedging devd. If a write(2) on devd.pipe would block, the client in question will be removed [1] Requested by: rwatson [1] Approved by: imp
2005-07-13 17:28:11 +00:00
chmod(name, 0666);
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
return (fd);
}
list<int> clients;
void
notify_clients(const char *data, int len)
{
list<int> bad;
list<int>::const_iterator i;
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (i = clients.begin(); i != clients.end(); ++i) {
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
if (write(*i, data, len) <= 0) {
bad.push_back(*i);
close(*i);
}
}
Avoid the creation of a temporary object by using the prefix operator for non-primitive types. Approved by: cperciva MFC after: 2 weeks
2012-12-06 01:25:17 +00:00
for (i = bad.begin(); i != bad.end(); ++i)
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
clients.erase(find(clients.begin(), clients.end(), *i));
}
void
new_client(int fd)
{
int s;
s = accept(fd, NULL, NULL);
if (s != -1)
clients.push_back(s);
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
static void
event_loop(void)
{
int rv;
int fd;
char buffer[DEVCTL_MAXBUF];
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
int once = 0;
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
int server_fd, max_fd;
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
timeval tv;
fd_set fds;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
Use O_CLOEXEC for open instead of separate fcntl(2) call.
2012-09-22 12:42:51 +00:00
fd = open(PATH_DEVCTL, O_RDONLY | O_CLOEXEC);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
if (fd == -1)
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
err(1, "Can't open devctl device %s", PATH_DEVCTL);
server_fd = create_socket(PIPE);
max_fd = max(fd, server_fd) + 1;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
while (1) {
if (romeo_must_die)
break;
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (!once && !dflag && !nflag) {
// Check to see if we have any events pending.
tv.tv_sec = 0;
tv.tv_usec = 0;
FD_ZERO(&fds);
FD_SET(fd, &fds);
rv = select(fd + 1, &fds, &fds, &fds, &tv);
// No events -> we've processed all pending events
Remove old workaround
2003-07-23 23:50:00 +00:00
if (rv == 0) {
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
if (Dflag)
fprintf(stderr, "Calling daemon\n");
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
cfg.remove_pidfile();
cfg.open_pidfile();
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
daemon(0, 0);
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
cfg.write_pidfile();
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
once++;
}
}
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
FD_ZERO(&fds);
FD_SET(fd, &fds);
FD_SET(server_fd, &fds);
rv = select(max_fd, &fds, NULL, NULL, NULL);
if (rv == -1) {
if (errno == EINTR)
continue;
err(1, "select");
}
if (FD_ISSET(fd, &fds)) {
rv = read(fd, buffer, sizeof(buffer) - 1);
if (rv > 0) {
notify_clients(buffer, rv);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
buffer[rv] = '\0';
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
while (buffer[--rv] == '\n')
buffer[rv] = '\0';
process_event(buffer);
} else if (rv < 0) {
if (errno != EINTR)
break;
} else {
/* EOF */
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
break;
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
Create a unix domain socket and write to it all the events that come in over the socket.
2004-07-01 07:24:18 +00:00
if (FD_ISSET(server_fd, &fds))
new_client(server_fd);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
}
close(fd);
}
/*
* functions that the parser uses.
*/
void
add_attach(int prio, event_proc *p)
{
cfg.add_attach(prio, p);
}
void
add_detach(int prio, event_proc *p)
{
cfg.add_detach(prio, p);
}
void
add_directory(const char *dir)
{
cfg.add_directory(dir);
free(const_cast<char *>(dir));
}
void
add_nomatch(int prio, event_proc *p)
{
cfg.add_nomatch(prio, p);
}
Parse the ! lines that will soon be coming from the kernel. These are a generalized notification mechanism for subsystems wishing to report events. Revieded by: njl # The kernel side seems like it might be causing panics for me, but should # be forthcoming shortly.
2003-10-24 22:02:29 +00:00
void
add_notify(int prio, event_proc *p)
{
cfg.add_notify(prio, p);
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
event_proc *
add_to_event_proc(event_proc *ep, eps *eps)
{
if (ep == NULL)
ep = new event_proc();
ep->add(eps);
return (ep);
}
eps *
new_action(const char *cmd)
{
eps *e = new action(cmd);
free(const_cast<char *>(cmd));
return (e);
}
eps *
new_match(const char *var, const char *re)
{
Latest snapshot of devd. This one adds re-matching and string expansion.
2002-12-18 07:08:01 +00:00
eps *e = new match(cfg, var, re);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
free(const_cast<char *>(var));
free(const_cast<char *>(re));
return (e);
}
Add the ability to match the on a media type of the device in question. Submitted by: sam Approved by: re (scottl)
2005-07-10 03:37:15 +00:00
eps *
new_media(const char *var, const char *re)
{
eps *e = new media(cfg, var, re);
free(const_cast<char *>(var));
free(const_cast<char *>(re));
return (e);
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
void
set_pidfile(const char *name)
{
cfg.set_pidfile(name);
free(const_cast<char *>(name));
}
void
set_variable(const char *var, const char *val)
{
cfg.set_variable(var, val);
free(const_cast<char *>(var));
free(const_cast<char *>(val));
}
static void
gensighand(int)
{
romeo_must_die++;
_exit(0);
}
static void
usage()
{
Add -f option to program's usage(), fix manpage's SYNOPSIS.
2006-09-17 22:49:26 +00:00
fprintf(stderr, "usage: %s [-Ddn] [-f file]\n", getprogname());
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
exit(1);
}
Put an anti-foot-shooting measure in place. Set hw.bus.devctl_disable to 0 when we startup. Print a warning in this case. This allows people that are playing with devd by hand to have something happen. Otherwise, it appears that devd isn't working because /dev/devctl is disabled and producing no events. Suggested by: peter on irc a long time ago.
2003-04-21 04:30:12 +00:00
static void
check_devd_enabled()
{
int val = 0;
size_t len;
len = sizeof(val);
sysctlbyname takes a size_t as its 5th argument, not a pointer. However, since NULL was used, and this is C++, this error went undetected until g++ 3.3 somehow managed to whine about it. Reported by: obrien
2003-05-02 17:38:08 +00:00
if (sysctlbyname(SYSCTL, &val, &len, NULL, 0) != 0)
Put an anti-foot-shooting measure in place. Set hw.bus.devctl_disable to 0 when we startup. Print a warning in this case. This allows people that are playing with devd by hand to have something happen. Otherwise, it appears that devd isn't working because /dev/devctl is disabled and producing no events. Suggested by: peter on irc a long time ago.
2003-04-21 04:30:12 +00:00
errx(1, "devctl sysctl missing from kernel!");
if (val) {
warnx("Setting " SYSCTL " to 0");
val = 0;
sysctlbyname(SYSCTL, NULL, NULL, &val, sizeof(val));
}
}
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
/*
* main
*/
int
main(int argc, char **argv)
{
int ch;
Put an anti-foot-shooting measure in place. Set hw.bus.devctl_disable to 0 when we startup. Print a warning in this case. This allows people that are playing with devd by hand to have something happen. Otherwise, it appears that devd isn't working because /dev/devctl is disabled and producing no events. Suggested by: peter on irc a long time ago.
2003-04-21 04:30:12 +00:00
check_devd_enabled();
Add a -f configfile option to devd(8), based on a patch submitted by Wojciech A. Koszek. Submitted by: Wojciech A. Koszek <dunstan@freebsd.czest.pl>
2005-11-24 14:39:41 +00:00
while ((ch = getopt(argc, argv, "Ddf:n")) != -1) {
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
switch (ch) {
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
case 'D':
Dflag++;
break;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
case 'd':
dflag++;
break;
Add a -f configfile option to devd(8), based on a patch submitted by Wojciech A. Koszek. Submitted by: Wojciech A. Koszek <dunstan@freebsd.czest.pl>
2005-11-24 14:39:41 +00:00
case 'f':
configfile = optarg;
break;
Implement a two new flags, and change the meaning of another one. 'd': now means don't do daemon(). 'D': Debug 'n': Don't wait to process all pending events before calling daemon. In the past, devd would call daemon immediately. However, this causes a race. If anything in the boot process depends on configuring the devices configured by devd, maybe they would be configured in time, maybe not. Now we don't call daemon until all pending events are processed, unless -n is specified. # -n is actually the default for a while due to the select(2) bug in devctl # that I just fixed to give people a chance to upgrade.
2003-04-21 06:26:08 +00:00
case 'n':
nflag++;
break;
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
default:
usage();
}
}
cfg.parse();
Drop the pid file after we call the final daemon call. w/o -n would give the wrong pid. Submitted by: ru and Lukas Ertl PR: 54113
2003-07-05 00:43:50 +00:00
if (!dflag && nflag) {
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
cfg.open_pidfile();
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
daemon(0, 0);
Use pidfile(3). OK'ed by: imp
2006-01-30 22:50:13 +00:00
cfg.write_pidfile();
Drop the pid file after we call the final daemon call. w/o -n would give the wrong pid. Submitted by: ru and Lukas Ertl PR: 54113
2003-07-05 00:43:50 +00:00
}
Ignore sigpipe so we can properly detach clients to the pipe. Submitted by: Fredrik Lindberg
2005-05-16 20:51:46 +00:00
signal(SIGPIPE, SIG_IGN);
MFp4 (imp_freebsd branch): snapshot of devd work: o improve parsing and lexing o create data structures based on the parsed file now. o Still need to rewrite main loop and add regex (still uses hard coded devd-generic) o minor man page updates. # There should be one more commit before rc2 Approved by: re (blanket)
2002-12-07 08:04:36 +00:00
signal(SIGHUP, gensighand);
signal(SIGINT, gensighand);
signal(SIGTERM, gensighand);
event_loop();
return (0);
}
Reference in New Issue Copy Permalink