Large patch from Frank Cusack <fcusack@fcusack.com> to add proper

[ppp.git] / pppd / sys-solaris.c

diff --git a/pppd/sys-solaris.c b/pppd/sys-solaris.c
index 859cd2a1a3caa8665f5968137b5c9060ffe71539..dc2fe2bc20aab2c6ea72ea63a0194b941afbf7c7 100644 (file)
--- a/pppd/sys-solaris.c
+++ b/pppd/sys-solaris.c
@@ -42,7 +42,7 @@
  * OR MODIFICATIONS.
  */
 
-#define RCSID  "$Id: sys-solaris.c,v 1.3 2001/03/08 05:14:26 paulus Exp $"
+#define RCSID  "$Id: sys-solaris.c,v 1.7 2002/02/12 20:07:09 dfs Exp $"
 
 #include <limits.h>
 #include <stdio.h>
@@ -875,10 +875,10 @@ any_compressions()
 }
 
 /*
- * establish_ppp - Turn the serial port into a ppp interface.
+ * tty_establish_ppp - Turn the serial port into a ppp interface.
  */
 int
-establish_ppp(fd)
+tty_establish_ppp(fd)
     int fd;
 {
     int i;
@@ -933,21 +933,12 @@ establish_ppp(fd)
 }
 
 /*
- * restore_loop - reattach the ppp unit to the loopback.
- * This doesn't need to do anything because disestablish_ppp does it.
- */
-void
-restore_loop()
-{
-}
-
-/*
- * disestablish_ppp - Restore the serial port to normal operation.
+ * tty_disestablish_ppp - Restore the serial port to normal operation.
  * It attempts to reconstruct the stream with the previously popped
  * modules.  This shouldn't call die() because it's called from die().
  */
 void
-disestablish_ppp(fd)
+tty_disestablish_ppp(fd)
     int fd;
 {
     int i;
@@ -1301,8 +1292,8 @@ output(unit, p, len)
     int retries;
     struct pollfd pfd;
 
-    if (debug)
-       dbglog("sent %P", p, len);
+    dump_packet("sent", p, len);
+    if (snoop_send_hook) snoop_send_hook(p, len);
 
     data.len = len;
     data.buf = (caddr_t) p;
@@ -1529,7 +1520,7 @@ tty_send_config(mtu, asyncmap, pcomp, accomp)
 }
 
 /*
- * ppp_set_xaccm - set the extended transmit ACCM for the interface.
+ * tty_set_xaccm - set the extended transmit ACCM for the interface.
  */
 void
 tty_set_xaccm(accm)
@@ -1546,7 +1537,7 @@ tty_set_xaccm(accm)
 }
 
 /*
- * ppp_recv_config - configure the receive-side characteristics of
+ * tty_recv_config - configure the receive-side characteristics of
  * the ppp interface.
  */
 void
@@ -1638,6 +1629,8 @@ get_ppp_stats(u, stats)
     }
     stats->bytes_in = s.p.ppp_ibytes;
     stats->bytes_out = s.p.ppp_obytes;
+    stats->pkts_in = s.p.ppp_ipackets;
+    stats->pkts_out = s.p.ppp_opackets;
     return 1;
 }
 
@@ -1965,12 +1958,6 @@ sifaddr(u, o, h, m)
        error("Couldn't set remote IP address: %m");
        ret = 0;
     }
-#if 0  /* now done in ppp_send_config */
-    ifr.ifr_metric = link_mtu;
-    if (ioctl(ipfd, SIOCSIFMTU, &ifr) < 0) {
-       error("Couldn't set IP MTU: %m");
-    }
-#endif
 
     remote_addr = h;
     return ret;