| blob | 220dacdbaa3d99c19dda983e88d4d64fdda29700 |
1 --- ppp-2.4.7.orig/pppd/pppd.h 2014-08-09 14:31:39.000000000 +0200
2 +++ ppp-2.4.7/pppd/pppd.h 2015-06-09 13:01:25.000000000 +0200
3 @@ -198,8 +198,8 @@ struct epdisc {
4 #define EPD_MAGIC 4
5 #define EPD_PHONENUM 5
7 -typedef void (*notify_func) __P((void *, int));
8 -typedef void (*printer_func) __P((void *, char *, ...));
9 +typedef void (*notify_func) (void *, int);
10 +typedef void (*printer_func) (void *, char *, ...);
12 struct notifier {
13 struct notifier *next;
14 @@ -397,34 +397,34 @@ extern int option_priority; /* priority
15 struct protent {
16 u_short protocol; /* PPP protocol number */
17 /* Initialization procedure */
18 - void (*init) __P((int unit));
19 + void (*init) (int unit);
20 /* Process a received packet */
21 - void (*input) __P((int unit, u_char *pkt, int len));
22 + void (*input) (int unit, u_char *pkt, int len);
23 /* Process a received protocol-reject */
24 - void (*protrej) __P((int unit));
25 + void (*protrej) (int unit);
26 /* Lower layer has come up */
27 - void (*lowerup) __P((int unit));
28 + void (*lowerup) (int unit);
29 /* Lower layer has gone down */
30 - void (*lowerdown) __P((int unit));
31 + void (*lowerdown) (int unit);
32 /* Open the protocol */
33 - void (*open) __P((int unit));
34 + void (*open) (int unit);
35 /* Close the protocol */
36 - void (*close) __P((int unit, char *reason));
37 + void (*close) (int unit, char *reason);
38 /* Print a packet in readable form */
39 - int (*printpkt) __P((u_char *pkt, int len, printer_func printer,
40 - void *arg));
41 + int (*printpkt) (u_char *pkt, int len, printer_func printer,
42 + void *arg);
43 /* Process a received data packet */
44 - void (*datainput) __P((int unit, u_char *pkt, int len));
45 + void (*datainput) (int unit, u_char *pkt, int len);
46 bool enabled_flag; /* 0 iff protocol is disabled */
47 char *name; /* Text name of protocol */
48 char *data_name; /* Text name of corresponding data protocol */
49 option_t *options; /* List of command-line options */
50 /* Check requested options, assign defaults */
51 - void (*check_options) __P((void));
52 + void (*check_options) (void);
53 /* Configure interface for demand-dial */
54 - int (*demand_conf) __P((int unit));
55 + int (*demand_conf) (int unit);
56 /* Say whether to bring up link for this pkt */
57 - int (*active_pkt) __P((u_char *pkt, int len));
58 + int (*active_pkt) (u_char *pkt, int len);
59 };
61 /* Table of pointers to supported protocols */
62 @@ -441,25 +441,25 @@ struct channel {
63 /* set of options for this channel */
64 option_t *options;
65 /* find and process a per-channel options file */
66 - void (*process_extra_options) __P((void));
67 + void (*process_extra_options) (void);
68 /* check all the options that have been given */
69 - void (*check_options) __P((void));
70 + void (*check_options) (void);
71 /* get the channel ready to do PPP, return a file descriptor */
72 - int (*connect) __P((void));
73 + int (*connect) (void);
74 /* we're finished with the channel */
75 - void (*disconnect) __P((void));
76 + void (*disconnect) (void);
77 /* put the channel into PPP `mode' */
78 - int (*establish_ppp) __P((int));
79 + int (*establish_ppp) (int);
80 /* take the channel out of PPP `mode', restore loopback if demand */
81 - void (*disestablish_ppp) __P((int));
82 + void (*disestablish_ppp) (int);
83 /* set the transmit-side PPP parameters of the channel */
84 - void (*send_config) __P((int, u_int32_t, int, int));
85 + void (*send_config) (int, u_int32_t, int, int);
86 /* set the receive-side PPP parameters of the channel */
87 - void (*recv_config) __P((int, u_int32_t, int, int));
88 + void (*recv_config) (int, u_int32_t, int, int);
89 /* cleanup on error or normal exit */
90 - void (*cleanup) __P((void));
91 + void (*cleanup) (void);
92 /* close the device, called in children after fork */
93 - void (*close) __P((void));
94 + void (*close) (void);
95 };
97 extern struct channel *the_channel;
98 @@ -484,117 +484,117 @@ extern struct userenv *userenv_list;
99 */
101 /* Procedures exported from main.c. */
102 -void set_ifunit __P((int)); /* set stuff that depends on ifunit */
103 -void detach __P((void)); /* Detach from controlling tty */
104 -void die __P((int)); /* Cleanup and exit */
105 -void quit __P((void)); /* like die(1) */
106 -void novm __P((char *)); /* Say we ran out of memory, and die */
107 -void timeout __P((void (*func)(void *), void *arg, int s, int us));
108 +void set_ifunit (int); /* set stuff that depends on ifunit */
109 +void detach (void); /* Detach from controlling tty */
110 +void die (int); /* Cleanup and exit */
111 +void quit (void); /* like die(1) */
112 +void novm (char *); /* Say we ran out of memory, and die */
113 +void timeout (void (*func)(void *), void *arg, int s, int us);
114 /* Call func(arg) after s.us seconds */
115 -void untimeout __P((void (*func)(void *), void *arg));
116 +void untimeout (void (*func)(void *), void *arg);
117 /* Cancel call to func(arg) */
118 -void record_child __P((int, char *, void (*) (void *), void *, int));
119 -pid_t safe_fork __P((int, int, int)); /* Fork & close stuff in child */
120 -int device_script __P((char *cmd, int in, int out, int dont_wait));
121 +void record_child (int, char *, void (*) (void *), void *, int);
122 +pid_t safe_fork (int, int, int); /* Fork & close stuff in child */
123 +int device_script (char *cmd, int in, int out, int dont_wait);
124 /* Run `cmd' with given stdin and stdout */
125 -pid_t run_program __P((char *prog, char **args, int must_exist,
126 - void (*done)(void *), void *arg, int wait));
127 +pid_t run_program (char *prog, char **args, int must_exist,
128 + void (*done)(void *), void *arg, int wait);
129 /* Run program prog with args in child */
130 -void reopen_log __P((void)); /* (re)open the connection to syslog */
131 -void print_link_stats __P((void)); /* Print stats, if available */
132 -void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */
133 -void update_link_stats __P((int)); /* Get stats at link termination */
134 -void script_setenv __P((char *, char *, int)); /* set script env var */
135 -void script_unsetenv __P((char *)); /* unset script env var */
136 -void new_phase __P((int)); /* signal start of new phase */
137 -void add_notifier __P((struct notifier **, notify_func, void *));
138 -void remove_notifier __P((struct notifier **, notify_func, void *));
139 -void notify __P((struct notifier *, int));
140 -int ppp_send_config __P((int, int, u_int32_t, int, int));
141 -int ppp_recv_config __P((int, int, u_int32_t, int, int));
142 -const char *protocol_name __P((int));
143 -void remove_pidfiles __P((void));
144 -void lock_db __P((void));
145 -void unlock_db __P((void));
146 +void reopen_log (void); /* (re)open the connection to syslog */
147 +void print_link_stats (void); /* Print stats, if available */
148 +void reset_link_stats (int); /* Reset (init) stats when link goes up */
149 +void update_link_stats (int); /* Get stats at link termination */
150 +void script_setenv (char *, char *, int); /* set script env var */
151 +void script_unsetenv (char *); /* unset script env var */
152 +void new_phase (int); /* signal start of new phase */
153 +void add_notifier (struct notifier **, notify_func, void *);
154 +void remove_notifier (struct notifier **, notify_func, void *);
155 +void notify (struct notifier *, int);
156 +int ppp_send_config (int, int, u_int32_t, int, int);
157 +int ppp_recv_config (int, int, u_int32_t, int, int);
158 +const char *protocol_name (int);
159 +void remove_pidfiles (void);
160 +void lock_db (void);
161 +void unlock_db (void);
163 /* Procedures exported from tty.c. */
164 -void tty_init __P((void));
165 +void tty_init (void);
167 /* Procedures exported from utils.c. */
168 -void log_packet __P((u_char *, int, char *, int));
169 +void log_packet (u_char *, int, char *, int);
170 /* Format a packet and log it with syslog */
171 -void print_string __P((char *, int, printer_func, void *));
172 +void print_string (char *, int, printer_func, void *);
173 /* Format a string for output */
174 -int slprintf __P((char *, int, char *, ...)); /* sprintf++ */
175 -int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */
176 -size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */
177 -size_t strlcat __P((char *, const char *, size_t)); /* safe strncpy */
178 -void dbglog __P((char *, ...)); /* log a debug message */
179 -void info __P((char *, ...)); /* log an informational message */
180 -void notice __P((char *, ...)); /* log a notice-level message */
181 -void warn __P((char *, ...)); /* log a warning message */
182 -void error __P((char *, ...)); /* log an error message */
183 -void fatal __P((char *, ...)); /* log an error message and die(1) */
184 -void init_pr_log __P((const char *, int)); /* initialize for using pr_log */
185 -void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */
186 -void end_pr_log __P((void)); /* finish up after using pr_log */
187 -void dump_packet __P((const char *, u_char *, int));
188 +int slprintf (char *, int, char *, ...); /* sprintf++ */
189 +int vslprintf (char *, int, char *, va_list); /* vsprintf++ */
190 +size_t strlcpy (char *, const char *, size_t); /* safe strcpy */
191 +size_t strlcat (char *, const char *, size_t); /* safe strncpy */
192 +void dbglog (char *, ...); /* log a debug message */
193 +void info (char *, ...); /* log an informational message */
194 +void notice (char *, ...); /* log a notice-level message */
195 +void warn (char *, ...); /* log a warning message */
196 +void error (char *, ...); /* log an error message */
197 +void fatal (char *, ...); /* log an error message and die(1) */
198 +void init_pr_log (const char *, int); /* initialize for using pr_log */
199 +void pr_log (void *, char *, ...); /* printer fn, output to syslog */
200 +void end_pr_log (void); /* finish up after using pr_log */
201 +void dump_packet (const char *, u_char *, int);
202 /* dump packet to debug log if interesting */
203 -ssize_t complete_read __P((int, void *, size_t));
204 +ssize_t complete_read (int, void *, size_t);
205 /* read a complete buffer */
207 /* Procedures exported from auth.c */
208 -void link_required __P((int)); /* we are starting to use the link */
209 -void start_link __P((int)); /* bring the link up now */
210 -void link_terminated __P((int)); /* we are finished with the link */
211 -void link_down __P((int)); /* the LCP layer has left the Opened state */
212 -void upper_layers_down __P((int));/* take all NCPs down */
213 -void link_established __P((int)); /* the link is up; authenticate now */
214 -void start_networks __P((int)); /* start all the network control protos */
215 -void continue_networks __P((int)); /* start network [ip, etc] control protos */
216 -void np_up __P((int, int)); /* a network protocol has come up */
217 -void np_down __P((int, int)); /* a network protocol has gone down */
218 -void np_finished __P((int, int)); /* a network protocol no longer needs link */
219 -void auth_peer_fail __P((int, int));
220 +void link_required (int); /* we are starting to use the link */
221 +void start_link (int); /* bring the link up now */
222 +void link_terminated (int); /* we are finished with the link */
223 +void link_down (int); /* the LCP layer has left the Opened state */
224 +void upper_layers_down (int);/* take all NCPs down */
225 +void link_established (int); /* the link is up; authenticate now */
226 +void start_networks (int); /* start all the network control protos */
227 +void continue_networks (int); /* start network [ip, etc] control protos */
228 +void np_up (int, int); /* a network protocol has come up */
229 +void np_down (int, int); /* a network protocol has gone down */
230 +void np_finished (int, int); /* a network protocol no longer needs link */
231 +void auth_peer_fail (int, int);
232 /* peer failed to authenticate itself */
233 -void auth_peer_success __P((int, int, int, char *, int));
234 +void auth_peer_success (int, int, int, char *, int);
235 /* peer successfully authenticated itself */
236 -void auth_withpeer_fail __P((int, int));
237 +void auth_withpeer_fail (int, int);
238 /* we failed to authenticate ourselves */
239 -void auth_withpeer_success __P((int, int, int));
240 +void auth_withpeer_success (int, int, int);
241 /* we successfully authenticated ourselves */
242 -void auth_check_options __P((void));
243 +void auth_check_options (void);
244 /* check authentication options supplied */
245 -void auth_reset __P((int)); /* check what secrets we have */
246 -int check_passwd __P((int, char *, int, char *, int, char **));
247 +void auth_reset (int); /* check what secrets we have */
248 +int check_passwd (int, char *, int, char *, int, char **);
249 /* Check peer-supplied username/password */
250 -int get_secret __P((int, char *, char *, char *, int *, int));
251 +int get_secret (int, char *, char *, char *, int *, int);
252 /* get "secret" for chap */
253 -int get_srp_secret __P((int unit, char *client, char *server, char *secret,
254 - int am_server));
255 -int auth_ip_addr __P((int, u_int32_t));
256 +int get_srp_secret (int unit, char *client, char *server, char *secret,
257 + int am_server);
258 +int auth_ip_addr (int, u_int32_t);
259 /* check if IP address is authorized */
260 -int auth_number __P((void)); /* check if remote number is authorized */
261 -int bad_ip_adrs __P((u_int32_t));
262 +int auth_number (void); /* check if remote number is authorized */
263 +int bad_ip_adrs (u_int32_t);
264 /* check if IP address is unreasonable */
266 /* Procedures exported from demand.c */
267 -void demand_conf __P((void)); /* config interface(s) for demand-dial */
268 -void demand_block __P((void)); /* set all NPs to queue up packets */
269 -void demand_unblock __P((void)); /* set all NPs to pass packets */
270 -void demand_discard __P((void)); /* set all NPs to discard packets */
271 -void demand_rexmit __P((int)); /* retransmit saved frames for an NP */
272 -int loop_chars __P((unsigned char *, int)); /* process chars from loopback */
273 -int loop_frame __P((unsigned char *, int)); /* should we bring link up? */
274 +void demand_conf (void); /* config interface(s) for demand-dial */
275 +void demand_block (void); /* set all NPs to queue up packets */
276 +void demand_unblock (void); /* set all NPs to pass packets */
277 +void demand_discard (void); /* set all NPs to discard packets */
278 +void demand_rexmit (int); /* retransmit saved frames for an NP */
279 +int loop_chars (unsigned char *, int); /* process chars from loopback */
280 +int loop_frame (unsigned char *, int); /* should we bring link up? */
282 /* Procedures exported from multilink.c */
283 #ifdef HAVE_MULTILINK
284 -void mp_check_options __P((void)); /* Check multilink-related options */
285 -int mp_join_bundle __P((void)); /* join our link to an appropriate bundle */
286 -void mp_exit_bundle __P((void)); /* have disconnected our link from bundle */
287 -void mp_bundle_terminated __P((void));
288 -char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */
289 -int str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */
290 +void mp_check_options (void); /* Check multilink-related options */
291 +int mp_join_bundle (void); /* join our link to an appropriate bundle */
292 +void mp_exit_bundle (void); /* have disconnected our link from bundle */
293 +void mp_bundle_terminated (void);
294 +char *epdisc_to_str (struct epdisc *); /* string from endpoint discrim. */
295 +int str_to_epdisc (struct epdisc *, char *); /* endpt disc. from str */
296 #else
297 #define mp_bundle_terminated() /* nothing */
298 #define mp_exit_bundle() /* nothing */
299 @@ -603,147 +603,147 @@ int str_to_epdisc __P((struct epdisc *,
300 #endif
302 /* Procedures exported from sys-*.c */
303 -void sys_init __P((void)); /* Do system-dependent initialization */
304 -void sys_cleanup __P((void)); /* Restore system state before exiting */
305 -int sys_check_options __P((void)); /* Check options specified */
306 -void sys_close __P((void)); /* Clean up in a child before execing */
307 -int ppp_available __P((void)); /* Test whether ppp kernel support exists */
308 -int get_pty __P((int *, int *, char *, int)); /* Get pty master/slave */
309 -int open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
310 -int tty_establish_ppp __P((int)); /* Turn serial port into a ppp interface */
311 -void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
312 -void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
313 -int generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
314 -void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
315 -int bundle_attach __P((int)); /* Attach link to existing bundle */
316 -void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
317 -void destroy_bundle __P((void)); /* Tell driver to destroy bundle */
318 -void clean_check __P((void)); /* Check if line was 8-bit clean */
319 -void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
320 -void restore_tty __P((int)); /* Restore port's original parameters */
321 -void setdtr __P((int, int)); /* Raise or lower port's DTR line */
322 -void output __P((int, u_char *, int)); /* Output a PPP packet */
323 -void wait_input __P((struct timeval *));
324 +void sys_init (void); /* Do system-dependent initialization */
325 +void sys_cleanup (void); /* Restore system state before exiting */
326 +int sys_check_options (void); /* Check options specified */
327 +void sys_close (void); /* Clean up in a child before execing */
328 +int ppp_available (void); /* Test whether ppp kernel support exists */
329 +int get_pty (int *, int *, char *, int); /* Get pty master/slave */
330 +int open_ppp_loopback (void); /* Open loopback for demand-dialling */
331 +int tty_establish_ppp (int); /* Turn serial port into a ppp interface */
332 +void tty_disestablish_ppp (int); /* Restore port to normal operation */
333 +void generic_disestablish_ppp (int dev_fd); /* Restore device setting */
334 +int generic_establish_ppp (int dev_fd); /* Make a ppp interface */
335 +void make_new_bundle (int, int, int, int); /* Create new bundle */
336 +int bundle_attach (int); /* Attach link to existing bundle */
337 +void cfg_bundle (int, int, int, int); /* Configure existing bundle */
338 +void destroy_bundle (void); /* Tell driver to destroy bundle */
339 +void clean_check (void); /* Check if line was 8-bit clean */
340 +void set_up_tty (int, int); /* Set up port's speed, parameters, etc. */
341 +void restore_tty (int); /* Restore port's original parameters */
342 +void setdtr (int, int); /* Raise or lower port's DTR line */
343 +void output (int, u_char *, int); /* Output a PPP packet */
344 +void wait_input (struct timeval *);
345 /* Wait for input, with timeout */
346 -void add_fd __P((int)); /* Add fd to set to wait for */
347 -void remove_fd __P((int)); /* Remove fd from set to wait for */
348 -int read_packet __P((u_char *)); /* Read PPP packet */
349 -int get_loop_output __P((void)); /* Read pkts from loopback */
350 -void tty_send_config __P((int, u_int32_t, int, int));
351 +void add_fd (int); /* Add fd to set to wait for */
352 +void remove_fd (int); /* Remove fd from set to wait for */
353 +int read_packet (u_char *); /* Read PPP packet */
354 +int get_loop_output (void); /* Read pkts from loopback */
355 +void tty_send_config (int, u_int32_t, int, int);
356 /* Configure i/f transmit parameters */
357 -void tty_set_xaccm __P((ext_accm));
358 +void tty_set_xaccm (ext_accm);
359 /* Set extended transmit ACCM */
360 -void tty_recv_config __P((int, u_int32_t, int, int));
361 +void tty_recv_config (int, u_int32_t, int, int);
362 /* Configure i/f receive parameters */
363 -int ccp_test __P((int, u_char *, int, int));
364 +int ccp_test (int, u_char *, int, int);
365 /* Test support for compression scheme */
366 -void ccp_flags_set __P((int, int, int));
367 +void ccp_flags_set (int, int, int);
368 /* Set kernel CCP state */
369 -int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
370 -int get_idle_time __P((int, struct ppp_idle *));
371 +int ccp_fatal_error (int); /* Test for fatal decomp error in kernel */
372 +int get_idle_time (int, struct ppp_idle *);
373 /* Find out how long link has been idle */
374 -int get_ppp_stats __P((int, struct pppd_stats *));
375 +int get_ppp_stats (int, struct pppd_stats *);
376 /* Return link statistics */
377 -void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
378 -int netif_get_mtu __P((int)); /* Get PPP interface MTU */
379 -int sifvjcomp __P((int, int, int, int));
380 +void netif_set_mtu (int, int); /* Set PPP interface MTU */
381 +int netif_get_mtu (int); /* Get PPP interface MTU */
382 +int sifvjcomp (int, int, int, int);
383 /* Configure VJ TCP header compression */
384 -int sifup __P((int)); /* Configure i/f up for one protocol */
385 -int sifnpmode __P((int u, int proto, enum NPmode mode));
386 +int sifup (int); /* Configure i/f up for one protocol */
387 +int sifnpmode (int u, int proto, enum NPmode mode);
388 /* Set mode for handling packets for proto */
389 -int sifdown __P((int)); /* Configure i/f down for one protocol */
390 -int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
391 +int sifdown (int); /* Configure i/f down for one protocol */
392 +int sifaddr (int, u_int32_t, u_int32_t, u_int32_t);
393 /* Configure IPv4 addresses for i/f */
394 -int cifaddr __P((int, u_int32_t, u_int32_t));
395 +int cifaddr (int, u_int32_t, u_int32_t);
396 /* Reset i/f IP addresses */
397 #ifdef INET6
398 int ether_to_eui64(eui64_t *p_eui64); /* convert eth0 hw address to EUI64 */
399 -int sif6up __P((int)); /* Configure i/f up for IPv6 */
400 -int sif6down __P((int)); /* Configure i/f down for IPv6 */
401 -int sif6addr __P((int, eui64_t, eui64_t));
402 +int sif6up (int); /* Configure i/f up for IPv6 */
403 +int sif6down (int); /* Configure i/f down for IPv6 */
404 +int sif6addr (int, eui64_t, eui64_t);
405 /* Configure IPv6 addresses for i/f */
406 -int cif6addr __P((int, eui64_t, eui64_t));
407 +int cif6addr (int, eui64_t, eui64_t);
408 /* Remove an IPv6 address from i/f */
409 #endif
410 -int sifdefaultroute __P((int, u_int32_t, u_int32_t));
411 +int sifdefaultroute (int, u_int32_t, u_int32_t);
412 /* Create default route through i/f */
413 -int cifdefaultroute __P((int, u_int32_t, u_int32_t));
414 +int cifdefaultroute (int, u_int32_t, u_int32_t);
415 /* Delete default route through i/f */
416 -int sifproxyarp __P((int, u_int32_t));
417 +int sifproxyarp (int, u_int32_t);
418 /* Add proxy ARP entry for peer */
419 -int cifproxyarp __P((int, u_int32_t));
420 +int cifproxyarp (int, u_int32_t);
421 /* Delete proxy ARP entry for peer */
422 -u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
423 -int lock __P((char *)); /* Create lock file for device */
424 -int relock __P((int)); /* Rewrite lock file with new pid */
425 -void unlock __P((void)); /* Delete previously-created lock file */
426 -void logwtmp __P((const char *, const char *, const char *));
427 +u_int32_t GetMask (u_int32_t); /* Get appropriate netmask for address */
428 +int lock (char *); /* Create lock file for device */
429 +int relock (int); /* Rewrite lock file with new pid */
430 +void unlock (void); /* Delete previously-created lock file */
431 +void logwtmp (const char *, const char *, const char *);
432 /* Write entry to wtmp file */
433 -int get_host_seed __P((void)); /* Get host-dependent random number seed */
434 -int have_route_to __P((u_int32_t)); /* Check if route to addr exists */
435 +int get_host_seed (void); /* Get host-dependent random number seed */
436 +int have_route_to (u_int32_t); /* Check if route to addr exists */
437 #ifdef PPP_FILTER
438 -int set_filters __P((struct bpf_program *pass, struct bpf_program *active));
439 +int set_filters (struct bpf_program *pass, struct bpf_program *active);
440 /* Set filter programs in kernel */
441 #endif
442 #ifdef IPX_CHANGE
443 -int sipxfaddr __P((int, unsigned long, unsigned char *));
444 -int cipxfaddr __P((int));
445 +int sipxfaddr (int, unsigned long, unsigned char *);
446 +int cipxfaddr (int);
447 #endif
448 -int get_if_hwaddr __P((u_char *addr, char *name));
449 -char *get_first_ethernet __P((void));
450 +int get_if_hwaddr (u_char *addr, char *name);
451 +char *get_first_ethernet (void);
453 /* Procedures exported from options.c */
454 -int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
455 -int parse_args __P((int argc, char **argv));
456 +int setipaddr (char *, char **, int); /* Set local/remote ip addresses */
457 +int parse_args (int argc, char **argv);
458 /* Parse options from arguments given */
459 -int options_from_file __P((char *filename, int must_exist, int check_prot,
460 - int privileged));
461 +int options_from_file (char *filename, int must_exist, int check_prot,
462 + int privileged);
463 /* Parse options from an options file */
464 -int options_from_user __P((void)); /* Parse options from user's .ppprc */
465 -int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
466 -int options_from_list __P((struct wordlist *, int privileged));
467 +int options_from_user (void); /* Parse options from user's .ppprc */
468 +int options_for_tty (void); /* Parse options from /etc/ppp/options.tty */
469 +int options_from_list (struct wordlist *, int privileged);
470 /* Parse options from a wordlist */
471 -int getword __P((FILE *f, char *word, int *newlinep, char *filename));
472 +int getword (FILE *f, char *word, int *newlinep, char *filename);
473 /* Read a word from a file */
474 -void option_error __P((char *fmt, ...));
475 +void option_error (char *fmt, ...);
476 /* Print an error message about an option */
477 -int int_option __P((char *, int *));
478 +int int_option (char *, int *);
479 /* Simplified number_option for decimal ints */
480 -void add_options __P((option_t *)); /* Add extra options */
481 -void check_options __P((void)); /* check values after all options parsed */
482 -int override_value __P((const char *, int, const char *));
483 +void add_options (option_t *); /* Add extra options */
484 +void check_options (void); /* check values after all options parsed */
485 +int override_value (const char *, int, const char *);
486 /* override value if permitted by priority */
487 -void print_options __P((printer_func, void *));
488 +void print_options (printer_func, void *);
489 /* print out values of all options */
491 -int parse_dotted_ip __P((char *, u_int32_t *));
492 +int parse_dotted_ip (char *, u_int32_t *);
494 /*
495 * Hooks to enable plugins to change various things.
496 */
497 -extern int (*new_phase_hook) __P((int));
498 -extern int (*idle_time_hook) __P((struct ppp_idle *));
499 -extern int (*holdoff_hook) __P((void));
500 -extern int (*pap_check_hook) __P((void));
501 -extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
502 +extern int (*new_phase_hook) (int);
503 +extern int (*idle_time_hook) (struct ppp_idle *);
504 +extern int (*holdoff_hook) (void);
505 +extern int (*pap_check_hook) (void);
506 +extern int (*pap_auth_hook) (char *user, char *passwd, char **msgp,
507 struct wordlist **paddrs,
508 - struct wordlist **popts));
509 -extern void (*pap_logout_hook) __P((void));
510 -extern int (*pap_passwd_hook) __P((char *user, char *passwd));
511 -extern int (*allowed_address_hook) __P((u_int32_t addr));
512 -extern void (*ip_up_hook) __P((void));
513 -extern void (*ip_down_hook) __P((void));
514 -extern void (*ip_choose_hook) __P((u_int32_t *));
515 -extern void (*ipv6_up_hook) __P((void));
516 -extern void (*ipv6_down_hook) __P((void));
517 + struct wordlist **popts);
518 +extern void (*pap_logout_hook)(void);
519 +extern int (*pap_passwd_hook) (char *user, char *passwd);
520 +extern int (*allowed_address_hook) (u_int32_t addr);
521 +extern void (*ip_up_hook) (void);
522 +extern void (*ip_down_hook) (void);
523 +extern void (*ip_choose_hook) (u_int32_t *);
524 +extern void (*ipv6_up_hook) (void);
525 +extern void (*ipv6_down_hook) (void);
527 -extern int (*chap_check_hook) __P((void));
528 -extern int (*chap_passwd_hook) __P((char *user, char *passwd));
529 -extern void (*multilink_join_hook) __P((void));
530 +extern int (*chap_check_hook) (void);
531 +extern int (*chap_passwd_hook) (char *user, char *passwd);
532 +extern void (*multilink_join_hook) (void);
534 /* Let a plugin snoop sent and received packets. Useful for L2TP */
535 -extern void (*snoop_recv_hook) __P((unsigned char *p, int len));
536 -extern void (*snoop_send_hook) __P((unsigned char *p, int len));
537 +extern void (*snoop_recv_hook) (unsigned char *p, int len);
538 +extern void (*snoop_send_hook) (unsigned char *p, int len);
540 /*
541 * Inline versions of get/put char/short/long.