OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

      bool proxy_arp;		/* Make proxy ARP entry for peer? */
      bool neg_vj;		/* Van Jacobson Compression? */
      bool old_vj;		/* use old (short) form of VJ option? */
 --- a/pppd/pppd.8
 +++ b/pppd/pppd.8
-@@ -127,6 +127,11 @@ is no other default route with the same
+@@ -121,6 +121,11 @@ the gateway, when IPCP negotiation is su
- value of -1, the route is only added if there is no default route at
+ This entry is removed when the PPP connection is broken.  This option
- all.
+ is privileged if the \fInodefaultroute\fR option has been specified.
  .TP
 +.B replacedefaultroute
 +This option is a flag to the defaultroute option. If defaultroute is
 +set and this flag is also set, pppd replaces an existing default route
 +with the new default route.
 +.TP
  .B disconnect \fIscript
  Execute the command specified by \fIscript\fR, by passing it to a
  shell, after
-@@ -740,7 +745,12 @@ disable both forms of hardware flow cont
+@@ -734,7 +739,12 @@ disable both forms of hardware flow cont
  .TP
  .B nodefaultroute
  Disable the \fIdefaultroute\fR option.  The system administrator who
 -wishes to prevent users from creating default routes with pppd
 +wishes to prevent users from adding a default route with pppd
  can do so by placing this option in the /etc/ppp/options file.
  .TP
  .B nodeflate
 --- a/pppd/pppd.h
 +++ b/pppd/pppd.h
-@@ -681,7 +681,7 @@ int  sif6addr __P((int, eui64_t, eui64_t
+@@ -667,7 +667,7 @@ int  sif6addr __P((int, eui64_t, eui64_t
  int  cif6addr __P((int, eui64_t, eui64_t));
  				/* Remove an IPv6 address from i/f */
  #endif
 -int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
 +int  sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt));
 +static struct	rtentry old_def_rt;	/* Old default route */
 +static int	default_rt_repl_rest;	/* replace and restore old default rt */
  static u_int32_t proxy_arp_addr;	/* Addr for proxy arp entry added */
  static char proxy_arp_dev[16];		/* Device for proxy arp entry */
  static u_int32_t our_old_addr;		/* for detecting address changes */
-@@ -1570,6 +1572,9 @@ static int read_route_table(struct rtent
+@@ -1552,6 +1554,9 @@ static int read_route_table(struct rtent
  	p = NULL;
+     }
 +    SET_SA_FAMILY (rt->rt_dst,     AF_INET);
 +    SET_SA_FAMILY (rt->rt_gateway, AF_INET);
++
      SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
      SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
      SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
-@@ -1642,20 +1647,52 @@ int have_route_to(u_int32_t addr)
+@@ -1621,20 +1626,51 @@ int have_route_to(u_int32_t addr)
  /********************************************************************
+  *
   * sifdefaultroute - assign a default route through the address given.
 - */
+-
 -int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
 -{
 -    struct rtentry rt;
 -
--    if (defaultroute_exists(&rt, dfl_route_metric) && strcmp(rt.rt_dev, ifname) != 0) {
+-    if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
 -	if (rt.rt_flags & RTF_GATEWAY)
--	    error("not replacing existing default route via %I with metric %d",
+-	    error("not replacing existing default route via %I",
--		  SIN_ADDR(rt.rt_gateway), dfl_route_metric);
+-		  SIN_ADDR(rt.rt_gateway));
 -	else
 + *
 + * If the global default_rt_repl_rest flag is set, then this function
 + * already replaced the original system defaultroute with some other
 +    if (default_rt_repl_rest) {
 +	/* We have already reclaced the original defaultroute, if we
 +	   are called again, we will delete the current default route
 +	   and set the new default route in this function.
 +	   - this is normally only the case the doing demand: */
-+	if (defaultroute_exists(&tmp_rt, dfl_route_metric))
++	if (defaultroute_exists(&tmp_rt))
 +	    del_rt = &tmp_rt;
-+    } else if (defaultroute_exists(&old_def_rt, dfl_route_metric) &&
++    } else if (defaultroute_exists(&old_def_rt) &&
 +	       strcmp(old_def_rt.rt_dev, ifname) != 0) {
 +	/* We did not yet replace an existing default route, let's
 +	   check if we should save and replace a default route: */
 +	if (old_def_rt.rt_flags & RTF_GATEWAY) {
 +	    if (!replace) {
-+		error("not replacing existing default route via %I with metric %d",
++		error("not replacing existing default route via %I",
-+		      SIN_ADDR(old_def_rt.rt_gateway), dfl_route_metric);
++		      SIN_ADDR(old_def_rt.rt_gateway));
 +		return 0;
 +	    } else {
 +		/* we need to copy rt_dev because we need it permanent too: */
 +		char *tmp_dev = malloc(strlen(old_def_rt.rt_dev) + 1);
 +		strcpy(tmp_dev, old_def_rt.rt_dev);
 +		old_def_rt.rt_dev = tmp_dev;
++
-+		notice("replacing old default route to %s [%I] with metric %d",
++		notice("replacing old default route to %s [%I]",
-+			old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway),
++			old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
-+		        dfl_route_metric);
 +		default_rt_repl_rest = 1;
 +		del_rt = &old_def_rt;
 +	    }
 +	} else
- 	    error("not replacing existing default route through %s with metric %d",
+ 	    error("not replacing existing default route through %s",
--		  rt.rt_dev, dfl_route_metric);
+-		  rt.rt_dev);
 -	return 0;
-+		  old_def_rt.rt_dev, dfl_route_metric);
++		  old_def_rt.rt_dev);
+     }
      memset (&rt, 0, sizeof (rt));
-@@ -1671,10 +1708,16 @@ int sifdefaultroute (int unit, u_int32_t
+@@ -1649,10 +1685,16 @@ int sifdefaultroute (int unit, u_int32_t
      rt.rt_flags = RTF_UP;
      if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) {
 +	    return 0;
 +        }
      have_default_route = 1;
      return 1;
-@@ -1708,11 +1751,21 @@ int cifdefaultroute (int unit, u_int32_t
+@@ -1683,11 +1725,21 @@ int cifdefaultroute (int unit, u_int32_t
      rt.rt_flags = RTF_UP;
      if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) {
  	if (still_ppp()) {
 -	    if ( ! ok_error ( errno ))