X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipcp.c;h=ecbb74904cac8f6c4baceee6ec6465a035290c73;hp=580a89f553c1fdcdb0ce184644d2e5cee289c983;hb=2521ca94620dfd5d3864a6f68a171a8be83d5b8e;hpb=1a0d0104b71b71d18f9bf58591cc53d9b81f79a9 diff --git a/pppd/ipcp.c b/pppd/ipcp.c index 580a89f..ecbb749 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ipcp.c,v 1.24 1996/04/04 03:57:12 paulus Exp $"; +static char rcsid[] = "$Id: ipcp.c,v 1.28 1996/08/28 06:40:29 paulus Exp $"; #endif /* @@ -29,9 +29,13 @@ static char rcsid[] = "$Id: ipcp.c,v 1.24 1996/04/04 03:57:12 paulus Exp $"; #include #include #include +#include #include #include #include +#include +#include +#include #include "pppd.h" #include "fsm.h" @@ -84,11 +88,38 @@ static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */ "IPCP" /* String name of protocol */ }; +/* + * Protocol entry points from main code. + */ +static void ipcp_init __P((int)); +static void ipcp_open __P((int)); +static void ipcp_close __P((int, char *)); +static void ipcp_lowerup __P((int)); +static void ipcp_lowerdown __P((int)); +static void ipcp_input __P((int, u_char *, int)); +static void ipcp_protrej __P((int)); +static int ipcp_printpkt __P((u_char *, int, + void (*) __P((void *, char *, ...)), void *)); +static void ip_check_options __P((void)); +static int ip_demand_conf __P((int)); +static int ip_active_pkt __P((u_char *, int)); + struct protent ipcp_protent = { - PPP_IPCP, ipcp_init, ipcp_input, ipcp_protrej, - ipcp_lowerup, ipcp_lowerdown, ipcp_open, ipcp_close, - ipcp_printpkt, NULL, 1, "IPCP", - ip_check_options, ip_demand_conf, + PPP_IPCP, + ipcp_init, + ipcp_input, + ipcp_protrej, + ipcp_lowerup, + ipcp_lowerdown, + ipcp_open, + ipcp_close, + ipcp_printpkt, + NULL, + 1, + "IPCP", + ip_check_options, + ip_demand_conf, + ip_active_pkt }; /* @@ -128,7 +159,7 @@ u_int32_t ipaddr; /* * ipcp_init - Initialize IPCP. */ -void +static void ipcp_init(unit) int unit; { @@ -171,7 +202,7 @@ ipcp_init(unit) /* * ipcp_open - IPCP is allowed to come up. */ -void +static void ipcp_open(unit) int unit; { @@ -182,7 +213,7 @@ ipcp_open(unit) /* * ipcp_close - Take IPCP down. */ -void +static void ipcp_close(unit, reason) int unit; char *reason; @@ -194,7 +225,7 @@ ipcp_close(unit, reason) /* * ipcp_lowerup - The lower layer is up. */ -void +static void ipcp_lowerup(unit) int unit; { @@ -205,7 +236,7 @@ ipcp_lowerup(unit) /* * ipcp_lowerdown - The lower layer is down. */ -void +static void ipcp_lowerdown(unit) int unit; { @@ -216,7 +247,7 @@ ipcp_lowerdown(unit) /* * ipcp_input - Input IPCP packet. */ -void +static void ipcp_input(unit, p, len) int unit; u_char *p; @@ -231,7 +262,7 @@ ipcp_input(unit, p, len) * * Pretend the lower layer went down, so we shut up. */ -void +static void ipcp_protrej(unit) int unit; { @@ -1005,7 +1036,7 @@ endswitch: * ip_check_options - check that any IP-related options are OK, * and assign appropriate defaults. */ -void +static void ip_check_options() { struct hostent *hp; @@ -1031,13 +1062,11 @@ ip_check_options() } if (demand && wo->hisaddr == 0) { - fprintf(stderr, "%s: remote IP address required for demand-dialling\n", - progname); + option_error("remote IP address required for demand-dialling\n"); exit(1); } if (demand && wo->accept_remote) { - fprintf(stderr, "%s: ipcp-accept-remote is incompatible with demand\n", - progname); + option_error("ipcp-accept-remote is incompatible with demand\n"); exit(1); } } @@ -1047,7 +1076,7 @@ ip_check_options() * ip_demand_conf - configure the interface as though * IPCP were up, for use with dial-on-demand. */ -int +static int ip_demand_conf(u) int u; { @@ -1055,10 +1084,10 @@ ip_demand_conf(u) if (!sifaddr(u, wo->ouraddr, wo->hisaddr, GetMask(wo->ouraddr))) return 0; - if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE)) - return 0; if (!sifup(u)) return 0; + if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE)) + return 0; if (wo->default_route) if (sifdefaultroute(u, wo->hisaddr)) default_route_set[u] = 1; @@ -1133,9 +1162,11 @@ ipcp_up(f) } demand_rexmit(PPP_IP); sifnpmode(f->unit, PPP_IP, NPMODE_PASS); - - } else { - + } +#ifndef _linux_ /* Linux destroys routes when the device goes down. */ + else /* always use the code which adds the routes. */ +#endif + { /* * Set IP addresses and (if specified) netmask. */ @@ -1152,6 +1183,7 @@ ipcp_up(f) ipcp_close(f->unit, "Interface configuration failed"); return; } + sifnpmode(f->unit, PPP_IP, NPMODE_PASS); /* assign a default route through the interface if required */ if (ipcp_wantoptions[f->unit].default_route) @@ -1188,8 +1220,9 @@ ipcp_down(f) { u_int32_t ouraddr, hisaddr; - np_down(f->unit, PPP_IP); IPCPDEBUG((LOG_INFO, "ipcp: down")); + np_down(f->unit, PPP_IP); + sifvjcomp(f->unit, 0, 0, 0); /* * If we are doing dial-on-demand, set the interface @@ -1259,16 +1292,16 @@ ipcp_script(f, script) /* * ipcp_printpkt - print the contents of an IPCP packet. */ -char *ipcp_codenames[] = { +static char *ipcp_codenames[] = { "ConfReq", "ConfAck", "ConfNak", "ConfRej", "TermReq", "TermAck", "CodeRej" }; -int +static int ipcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer)(); + void (*printer) __P((void *, char *, ...)); void *arg; { int code, id, len, olen; @@ -1349,6 +1382,16 @@ ipcp_printpkt(p, plen, printer, arg) printer(arg, ">"); } break; + + case TERMACK: + case TERMREQ: + if (len > 0 && *p >= ' ' && *p < 0x7f) { + printer(arg, " "); + print_string(p, len, printer, arg); + p += len; + len = 0; + } + break; } /* print the rest of the bytes in the packet */ @@ -1359,3 +1402,49 @@ ipcp_printpkt(p, plen, printer, arg) return p - pstart; } + +/* + * ip_active_pkt - see if this IP packet is worth bringing the link up for. + * We don't bring the link up for IP fragments or for TCP FIN packets + * with no data. + */ +#ifndef IP_OFFMASK +#define IP_OFFMASK 0x1fff +#endif + +/* + * We use these macros because the IP header may be at an odd address, + * and some compilers might use word loads to get th_off or ip_hl. + */ + +#define net_short(x) (((x)[0] << 8) + (x)[1]) +#define get_iphl(x) (((unsigned char *)(x))[0] & 0xF) +#define get_ipoff(x) net_short((unsigned char *)(x) + 6) +#define get_tcpoff(x) (((unsigned char *)(x))[12] >> 4) + +static int +ip_active_pkt(pkt, len) + u_char *pkt; + int len; +{ + struct ip *ip; + struct tcphdr *tcp; + int hlen; + + len -= PPP_HDRLEN; + if (len < sizeof(struct ip) + PPP_HDRLEN) + return 0; + pkt += PPP_HDRLEN; + ip = (struct ip *) pkt; + if ((get_ipoff(ip) & IP_OFFMASK) != 0) + return 0; + if (ip->ip_p != IPPROTO_TCP) + return 1; + hlen = get_iphl(ip) * 4; + if (len < hlen + sizeof(struct tcphdr)) + return 0; + tcp = (struct tcphdr *) (pkt + hlen); + if ((tcp->th_flags & TH_FIN) != 0 && len == hlen + get_tcpoff(tcp) * 4) + return 0; + return 1; +}