* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * Copyright (c) 1999-2004 Paul Mackerras. All rights reserved.
+ * Copyright (c) 1999-2020 Paul Mackerras. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: main.c,v 1.156 2008/06/23 11:47:18 paulus Exp $"
-
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
char db_key[32];
-int (*holdoff_hook) __P((void)) = NULL;
-int (*new_phase_hook) __P((int)) = NULL;
-void (*snoop_recv_hook) __P((unsigned char *p, int len)) = NULL;
-void (*snoop_send_hook) __P((unsigned char *p, int len)) = NULL;
+int (*holdoff_hook)(void) = NULL;
+int (*new_phase_hook)(int) = NULL;
+void (*snoop_recv_hook)(unsigned char *p, int len) = NULL;
+void (*snoop_send_hook)(unsigned char *p, int len) = NULL;
static int conn_running; /* we have a [dis]connector running */
static int fd_loop; /* fd for getting demand-dial packets */
struct subprocess {
pid_t pid;
char *prog;
- void (*done) __P((void *));
+ void (*done)(void *);
void *arg;
int killable;
struct subprocess *next;
/* Prototypes for procedures local to this file. */
-static void setup_signals __P((void));
-static void create_pidfile __P((int pid));
-static void create_linkpidfile __P((int pid));
-static void cleanup __P((void));
-static void get_input __P((void));
-static void calltimeout __P((void));
-static struct timeval *timeleft __P((struct timeval *));
-static void kill_my_pg __P((int));
-static void hup __P((int));
-static void term __P((int));
-static void chld __P((int));
-static void toggle_debug __P((int));
-static void open_ccp __P((int));
-static void bad_signal __P((int));
-static void holdoff_end __P((void *));
-static void forget_child __P((int pid, int status));
-static int reap_kids __P((void));
-static void childwait_end __P((void *));
+static void setup_signals(void);
+static void create_pidfile(int pid);
+static void create_linkpidfile(int pid);
+static void cleanup(void);
+static void get_input(void);
+static void calltimeout(void);
+static struct timeval *timeleft(struct timeval *);
+static void kill_my_pg(int);
+static void hup(int);
+static void term(int);
+static void chld(int);
+static void toggle_debug(int);
+static void open_ccp(int);
+static void bad_signal(int);
+static void holdoff_end(void *);
+static void forget_child(int pid, int status);
+static int reap_kids(void);
+static void childwait_end(void *);
#ifdef USE_TDB
-static void update_db_entry __P((void));
-static void add_db_key __P((const char *));
-static void delete_db_key __P((const char *));
-static void cleanup_db __P((void));
+static void update_db_entry(void);
+static void add_db_key(const char *);
+static void delete_db_key(const char *);
+static void cleanup_db(void);
#endif
-static void handle_events __P((void));
-void print_link_stats __P((void));
-
-extern char *getlogin __P((void));
-int main __P((int, char *[]));
+static void handle_events(void);
+void print_link_stats(void);
-#ifdef ultrix
-#undef O_NONBLOCK
-#define O_NONBLOCK O_NDELAY
-#endif
-
-#ifdef ULTRIX
-#define setlogmask(x)
-#endif
+extern char *getlogin(void);
+int main(int, char *[]);
/*
* PPP Data Link Layer "protocol" table.
};
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
int i, t;
char *p;
* handle_events - wait for something to happen and respond to it.
*/
static void
-handle_events()
+handle_events(void)
{
struct timeval timo;
unsigned char buf[16];
* setup_signals - initialize signal handling.
*/
static void
-setup_signals()
+setup_signals(void)
{
struct sigaction sa;
* unit we are using.
*/
void
-set_ifunit(iskey)
- int iskey;
+set_ifunit(int iskey)
{
char ifkey[32];
* detach - detach us from the controlling terminal.
*/
void
-detach()
+detach(void)
{
int pid;
char numbuf[16];
* reopen_log - (re)open our connection to syslog.
*/
void
-reopen_log()
+reopen_log(void)
{
openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP);
setlogmask(LOG_UPTO(LOG_INFO));
* Create a file containing our process ID.
*/
static void
-create_pidfile(pid)
- int pid;
+create_pidfile(int pid)
{
FILE *pidfile;
}
void
-create_linkpidfile(pid)
- int pid;
+create_linkpidfile(int pid)
{
FILE *pidfile;
/*
* remove_pidfile - remove our pid files
*/
-void remove_pidfiles()
+void remove_pidfiles(void)
{
if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT)
warn("unable to delete pid file %s: %m", pidfilename);
* holdoff_end - called via a timeout when the holdoff period ends.
*/
static void
-holdoff_end(arg)
- void *arg;
+holdoff_end(void *arg)
{
new_phase(PHASE_DORMANT);
}
* protocol_name - find a name for a PPP protocol.
*/
const char *
-protocol_name(proto)
- int proto;
+protocol_name(int proto)
{
struct protocol_list *lp;
* get_input - called when incoming data is available.
*/
static void
-get_input()
+get_input(void)
{
int len, i;
u_char *p;
* itself), otherwise 0.
*/
int
-ppp_send_config(unit, mtu, accm, pcomp, accomp)
- int unit, mtu;
- u_int32_t accm;
- int pcomp, accomp;
+ppp_send_config(int unit, int mtu, u_int32_t accm, int pcomp, int accomp)
{
int errs;
* itself), otherwise 0.
*/
int
-ppp_recv_config(unit, mru, accm, pcomp, accomp)
- int unit, mru;
- u_int32_t accm;
- int pcomp, accomp;
+ppp_recv_config(int unit, int mru, u_int32_t accm, int pcomp, int accomp)
{
int errs;
* new_phase - signal the start of a new phase of pppd's operation.
*/
void
-new_phase(p)
- int p;
+new_phase(int p)
{
phase = p;
if (new_phase_hook)
* die - clean up state and exit with the specified status.
*/
void
-die(status)
- int status;
+die(int status)
{
if (!doing_multilink || multilink_master)
print_link_stats();
*/
/* ARGSUSED */
static void
-cleanup()
+cleanup(void)
{
sys_cleanup();
}
void
-print_link_stats()
+print_link_stats(void)
{
/*
* Print connect time and statistics.
* reset_link_stats - "reset" stats when link goes up.
*/
void
-reset_link_stats(u)
- int u;
+reset_link_stats(int u)
{
if (!get_ppp_stats(u, &old_link_stats))
return;
* update_link_stats - get stats at link termination.
*/
void
-update_link_stats(u)
- int u;
+update_link_stats(int u)
{
struct timeval now;
char numbuf[32];
struct callout {
struct timeval c_time; /* time at which to call routine */
void *c_arg; /* argument to routine */
- void (*c_func) __P((void *)); /* routine */
+ void (*c_func)(void *); /* routine */
struct callout *c_next;
};
* timeout - Schedule a timeout.
*/
void
-timeout(func, arg, secs, usecs)
- void (*func) __P((void *));
- void *arg;
- int secs, usecs;
+timeout(void (*func)(void *), void *arg, int secs, int usecs)
{
struct callout *newp, *p, **pp;
* untimeout - Unschedule a timeout.
*/
void
-untimeout(func, arg)
- void (*func) __P((void *));
- void *arg;
+untimeout(void (*func)(void *), void *arg)
{
struct callout **copp, *freep;
* calltimeout - Call any timeout routines which are now due.
*/
static void
-calltimeout()
+calltimeout(void)
{
struct callout *p;
* timeleft - return the length of time until the next timeout is due.
*/
static struct timeval *
-timeleft(tvp)
- struct timeval *tvp;
+timeleft(struct timeval *tvp)
{
if (callout == NULL)
return NULL;
* We assume that sig is currently blocked.
*/
static void
-kill_my_pg(sig)
- int sig;
+kill_my_pg(int sig)
{
struct sigaction act, oldact;
struct subprocess *chp;
* signal, we just take the link down.
*/
static void
-hup(sig)
- int sig;
+hup(int sig)
{
/* can't log a message here, it can deadlock */
got_sighup = 1;
*/
/*ARGSUSED*/
static void
-term(sig)
- int sig;
+term(int sig)
{
/* can't log a message here, it can deadlock */
got_sigterm = sig;
* Sets a flag so we will call reap_kids in the mainline.
*/
static void
-chld(sig)
- int sig;
+chld(int sig)
{
got_sigchld = 1;
if (waiting)
*/
/*ARGSUSED*/
static void
-toggle_debug(sig)
- int sig;
+toggle_debug(int sig)
{
debug = !debug;
if (debug) {
*/
/*ARGSUSED*/
static void
-open_ccp(sig)
- int sig;
+open_ccp(int sig)
{
got_sigusr2 = 1;
if (waiting)
* bad_signal - We've caught a fatal signal. Clean up state and exit.
*/
static void
-bad_signal(sig)
- int sig;
+bad_signal(int sig)
{
static int crashed = 0;
}
static bool
-add_script_env(pos, newstring)
- int pos;
- char *newstring;
+add_script_env(int pos, char *newstring)
{
if (pos + 1 >= s_env_nalloc) {
int new_n = pos + 17;
}
static void
-remove_script_env(pos)
- int pos;
+remove_script_env(int pos)
{
free(script_env[pos] - 1);
while ((script_env[pos] = script_env[pos + 1]) != NULL)
* and update the system environment.
*/
static void
-update_system_environment()
+update_system_environment(void)
{
struct userenv *uep;
* stderr gets connected to the log fd or to the _PATH_CONNERRS file.
*/
int
-device_script(program, in, out, dont_wait)
- char *program;
- int in, out;
- int dont_wait;
+device_script(char *program, int in, int out, int dont_wait)
{
int pid;
int status = -1;
* script_unsetenv() safely after this routine is run.
*/
static void
-update_script_environment()
+update_script_environment(void)
{
struct userenv *uep;
* reap_kids) iff the return value is > 0.
*/
pid_t
-run_program(prog, args, must_exist, done, arg, wait)
- char *prog;
- char **args;
- int must_exist;
- void (*done) __P((void *));
- void *arg;
- int wait;
+run_program(char *prog, char **args, int must_exist, void (*done)(void *), void *arg, int wait)
{
int pid, status;
struct stat sbuf;
* to use.
*/
void
-record_child(pid, prog, done, arg, killable)
- int pid;
- char *prog;
- void (*done) __P((void *));
- void *arg;
- int killable;
+record_child(int pid, char *prog, void (*done)(void *), void *arg, int killable)
{
struct subprocess *chp;
* exit, send them all a SIGTERM.
*/
static void
-childwait_end(arg)
- void *arg;
+childwait_end(void *arg)
{
struct subprocess *chp;
* forget_child - clean up after a dead child
*/
static void
-forget_child(pid, status)
- int pid, status;
+forget_child(int pid, int status)
{
struct subprocess *chp, **prevp;
* and log a message for abnormal terminations.
*/
static int
-reap_kids()
+reap_kids(void)
{
int pid, status;
* add_notifier - add a new function to be called when something happens.
*/
void
-add_notifier(notif, func, arg)
- struct notifier **notif;
- notify_func func;
- void *arg;
+add_notifier(struct notifier **notif, notify_func func, void *arg)
{
struct notifier *np;
* be called when something happens.
*/
void
-remove_notifier(notif, func, arg)
- struct notifier **notif;
- notify_func func;
- void *arg;
+remove_notifier(struct notifier **notif, notify_func func, void *arg)
{
struct notifier *np;
* notify - call a set of functions registered with add_notifier.
*/
void
-notify(notif, val)
- struct notifier *notif;
- int val;
+notify(struct notifier *notif, int val)
{
struct notifier *np;
* novm - log an error message saying we ran out of memory, and die.
*/
void
-novm(msg)
- char *msg;
+novm(char *msg)
{
fatal("Virtual memory exhausted allocating %s\n", msg);
}
* for scripts that we run (e.g. ip-up, auth-up, etc.)
*/
void
-script_setenv(var, value, iskey)
- char *var, *value;
- int iskey;
+script_setenv(char *var, char *value, int iskey)
{
size_t varl = strlen(var);
size_t vl = varl + strlen(value) + 2;
* for scripts.
*/
void
-script_unsetenv(var)
- char *var;
+script_unsetenv(char *var)
{
int vl = strlen(var);
int i;
* lock_db - get an exclusive lock on the TDB database.
* Used to ensure atomicity of various lookup/modify operations.
*/
-void lock_db()
+void lock_db(void)
{
#ifdef USE_TDB
TDB_DATA key;
/*
* unlock_db - remove the exclusive lock obtained by lock_db.
*/
-void unlock_db()
+void unlock_db(void)
{
#ifdef USE_TDB
TDB_DATA key;
* update_db_entry - update our entry in the database.
*/
static void
-update_db_entry()
+update_db_entry(void)
{
TDB_DATA key, dbuf;
int vlen, i;
* add_db_key - add a key that we can use to look up our database entry.
*/
static void
-add_db_key(str)
- const char *str;
+add_db_key(const char *str)
{
TDB_DATA key, dbuf;
* delete_db_key - delete a key for looking up our database entry.
*/
static void
-delete_db_key(str)
- const char *str;
+delete_db_key(const char *str)
{
TDB_DATA key;
* cleanup_db - delete all the entries we put in the database.
*/
static void
-cleanup_db()
+cleanup_db(void)
{
TDB_DATA key;
int i;
projects / ppp.git / blobdiff