Update for 2.4.1b1 release

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

diff --git a/pppd/sys-solaris.c b/pppd/sys-solaris.c
index 923bce84dc979050a654a47507c92494acda13bf..859cd2a1a3caa8665f5968137b5c9060ffe71539 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.1 2000/04/18 23:51:26 masputra Exp $"
+#define RCSID  "$Id: sys-solaris.c,v 1.3 2001/03/08 05:14:26 paulus Exp $"
 
 #include <limits.h>
 #include <stdio.h>
@@ -89,8 +89,12 @@
 #include "ipcp.h"
 #include "ccp.h"
 
+#if !defined(PPP_DRV_NAME)
+#define PPP_DRV_NAME   "ppp"
+#endif /* !defined(PPP_DRV_NAME) */
+
 #if !defined(PPP_DEV_NAME)
-#define PPP_DEV_NAME   "/dev/ppp"
+#define PPP_DEV_NAME   "/dev/" PPP_DRV_NAME
 #endif /* !defined(PPP_DEV_NAME) */
 
 #if !defined(AHDLC_MOD_NAME)
@@ -568,7 +572,7 @@ sys_init()
      * will fail, or maybe, I should move them to a later point ?
      * <adi.masputra@sun.com>
      */
-    sprintf(ifname, "ppp%d", ifunit);
+    sprintf(ifname, PPP_DRV_NAME "%d", ifunit);
 #endif /* defined(SOL2) */
     /*
      * Open the ppp device again and link it under the ip multiplexor.
@@ -706,7 +710,7 @@ sys_init()
 
 #if !defined(SOL2)
     /* Set the interface name for the link. */
-    slprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "ppp%d", ifunit);
+    slprintf(ifr.ifr_name, sizeof(ifr.ifr_name), PPP_DRV_NAME "%d", ifunit);
     ifr.ifr_metric = ipmuxid;
     if (strioctl(ipfd, SIOCSIFNAME, (char *)&ifr, sizeof ifr, 0) < 0)
        fatal("Can't set interface name %s: %m", ifr.ifr_name);
@@ -1456,48 +1460,23 @@ get_loop_output()
 }
 
 /*
- * ppp_send_config - configure the transmit characteristics of
- * the ppp interface.
+ * netif_set_mtu - set the MTU on the PPP network interface.
  */
 void
-ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
+netif_set_mtu(unit, mtu)
     int unit, mtu;
-    u_int32_t asyncmap;
-    int pcomp, accomp;
 {
-    int cf[2];
     struct ifreq ifr;
 #if defined(INET6) && defined(SOL2)
     struct lifreq lifr;
     int        fd;
 #endif /* defined(INET6) && defined(SOL2) */
 
-    link_mtu = mtu;
-    if (strioctl(pppfd, PPPIO_MTU, &mtu, sizeof(mtu), 0) < 0) {
-       if (hungup && errno == ENXIO)
-           return;
-       error("Couldn't set MTU: %m");
-    }
-    if (fdmuxid >= 0) {
-       if (!sync_serial) {
-           if (strioctl(pppfd, PPPIO_XACCM, &asyncmap, sizeof(asyncmap), 0) < 0) {
-               error("Couldn't set transmit ACCM: %m");
-           }
-       }
-       cf[0] = (pcomp? COMP_PROT: 0) + (accomp? COMP_AC: 0);
-       cf[1] = COMP_PROT | COMP_AC;
-       if (any_compressions() &&
-           strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
-           error("Couldn't set prot/AC compression: %m");
-       }
-    }
-
-    /* set the MTU for IP as well */
     memset(&ifr, 0, sizeof(ifr));
     strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
     ifr.ifr_metric = link_mtu;
     if (ioctl(ipfd, SIOCSIFMTU, &ifr) < 0) {
-       error("Couldn't set IP MTU: %m");
+       error("Couldn't set IP MTU (%s): %m", ifr.ifr_name);
     }
 
 #if defined(INET6) && defined(SOL2) 
@@ -1510,18 +1489,50 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
     lifr.lifr_mtu = link_mtu;
     if (ioctl(fd, SIOCSLIFMTU, &lifr) < 0) {
        close(fd);
-       error("Couldn't set IPv6 MTU: %m");
+       error("Couldn't set IPv6 MTU (%s): %m", ifr.ifr_name);
     }
     close(fd);
 #endif /* defined(INET6) && defined(SOL2) */
 }
 
+/*
+ * tty_send_config - configure the transmit characteristics of
+ * the ppp interface.
+ */
+void
+tty_send_config(mtu, asyncmap, pcomp, accomp)
+    int mtu;
+    u_int32_t asyncmap;
+    int pcomp, accomp;
+{
+    int cf[2];
+
+    link_mtu = mtu;
+    if (strioctl(pppfd, PPPIO_MTU, &mtu, sizeof(mtu), 0) < 0) {
+       if (hungup && errno == ENXIO)
+           return;
+       error("Couldn't set MTU: %m");
+    }
+    if (fdmuxid >= 0) {
+       if (!sync_serial) {
+           if (strioctl(pppfd, PPPIO_XACCM, &asyncmap, sizeof(asyncmap), 0) < 0) {
+               error("Couldn't set transmit ACCM: %m");
+           }
+       }
+       cf[0] = (pcomp? COMP_PROT: 0) + (accomp? COMP_AC: 0);
+       cf[1] = COMP_PROT | COMP_AC;
+       if (any_compressions() &&
+           strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
+           error("Couldn't set prot/AC compression: %m");
+       }
+    }
+}
+
 /*
  * ppp_set_xaccm - set the extended transmit ACCM for the interface.
  */
 void
-ppp_set_xaccm(unit, accm)
-    int unit;
+tty_set_xaccm(accm)
     ext_accm accm;
 {
     if (sync_serial)
@@ -1539,8 +1550,8 @@ ppp_set_xaccm(unit, accm)
  * the ppp interface.
  */
 void
-ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
-    int unit, mru;
+tty_recv_config(mru, asyncmap, pcomp, accomp)
+    int mru;
     u_int32_t asyncmap;
     int pcomp, accomp;
 {