*/
#ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.11 1994/09/21 06:47:37 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.14 1994/10/24 04:31:11 paulus Exp $";
#endif
/*
#include <syslog.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include "pppd.h"
#include "fsm.h"
#include "pathnames.h"
/* global vars */
-ipcp_options ipcp_wantoptions[N_PPP]; /* Options that we want to request */
-ipcp_options ipcp_gotoptions[N_PPP]; /* Options that peer ack'd */
-ipcp_options ipcp_allowoptions[N_PPP]; /* Options we allow peer to request */
-ipcp_options ipcp_hisoptions[N_PPP]; /* Options that we ack'd */
+ipcp_options ipcp_wantoptions[NUM_PPP]; /* Options that we want to request */
+ipcp_options ipcp_gotoptions[NUM_PPP]; /* Options that peer ack'd */
+ipcp_options ipcp_allowoptions[NUM_PPP]; /* Options we allow peer to request */
+ipcp_options ipcp_hisoptions[NUM_PPP]; /* Options that we ack'd */
/* local vars */
-static int cis_received[N_PPP]; /* # Conf-Reqs received */
+static int cis_received[NUM_PPP]; /* # Conf-Reqs received */
/*
* Callbacks for fsm code. (CI = Configuration Information)
static void ipcp_down __P((fsm *)); /* We're DOWN */
static void ipcp_script __P((fsm *, char *)); /* Run an up/down script */
-fsm ipcp_fsm[N_PPP]; /* IPCP fsm structure */
+fsm ipcp_fsm[NUM_PPP]; /* IPCP fsm structure */
static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */
ipcp_resetci, /* Reset our Configuration Information */
* Accept the peer's idea of {our,his} address, if different
* from our idea, only if the accept_{local,remote} flag is set.
*/
- NAKCIADDR(CI_ADDR, neg_addr, go->old_addrs,
+ NAKCIADDR((go->old_addrs? CI_ADDRS: CI_ADDR), neg_addr, go->old_addrs,
if (go->accept_local && ciaddr1) { /* Do we know our address? */
try.ouraddr = ciaddr1;
IPCPDEBUG((LOG_INFO, "local IP address %s",