add a few defs

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

diff --git a/pppd/sys-sunos4.c b/pppd/sys-sunos4.c
index 2097c8afa5a3eca0f6804bf1bd5d731cd19b3538..74c0217ef2908d7c5ae160164b53dc0a42fec180 100644 (file)
--- a/pppd/sys-sunos4.c
+++ b/pppd/sys-sunos4.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: sys-sunos4.c,v 1.5 1996/05/27 00:00:56 paulus Exp $";
+static char rcsid[] = "$Id: sys-sunos4.c,v 1.8 1997/04/30 05:58:52 paulus Exp $";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -63,6 +63,9 @@ static char rcsid[] = "$Id: sys-sunos4.c,v 1.5 1996/05/27 00:00:56 paulus Exp $"
 
 #if defined(sun) && defined(sparc)
 #include <alloca.h>
 
 #if defined(sun) && defined(sparc)
 #include <alloca.h>

+#ifndef __GNUC__
+extern void *alloca();
+#endif

 #endif /*sparc*/
 
 static int     pppfd;
 #endif /*sparc*/
 
 static int     pppfd;


@@ -184,7 +187,7 @@ sys_cleanup()
     if (ifaddrs[0])
        cifaddr(0, ifaddrs[0], ifaddrs[1]);
     if (default_route_gateway)
     if (ifaddrs[0])
        cifaddr(0, ifaddrs[0], ifaddrs[1]);
     if (default_route_gateway)

-       cifdefaultroute(0, default_route_gateway);
+       cifdefaultroute(0, 0, default_route_gateway);

     if (proxy_arp_addr)
        cifproxyarp(0, proxy_arp_addr);
 }
     if (proxy_arp_addr)
        cifproxyarp(0, proxy_arp_addr);
 }


@@ -600,7 +603,7 @@ output(unit, p, len)
     struct pollfd pfd;
 
     if (debug)
     struct pollfd pfd;
 
     if (debug)

-       log_packet(p, len, "sent ");
+       log_packet(p, len, "sent ", LOG_DEBUG);

 
     data.len = len;
     data.buf = (caddr_t) p;
 
     data.len = len;
     data.buf = (caddr_t) p;


@@ -735,6 +738,7 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
     int pcomp, accomp;
 {
     int cf[2];
     int pcomp, accomp;
 {
     int cf[2];

+    struct ifreq ifr;

 
     link_mtu = mtu;
     if (strioctl(pppfd, PPPIO_MTU, &mtu, sizeof(mtu), 0) < 0) {
 
     link_mtu = mtu;
     if (strioctl(pppfd, PPPIO_MTU, &mtu, sizeof(mtu), 0) < 0) {


@@ -750,6 +754,14 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
     if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
        syslog(LOG_ERR, "Couldn't set prot/AC compression: %m");
     }
     if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
        syslog(LOG_ERR, "Couldn't set prot/AC compression: %m");
     }

+
+    /* set mtu for ip as well */
+    memset(&ifr, 0, sizeof(ifr));
+    strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+    ifr.ifr_metric = link_mtu;
+    if (ioctl(sockfd, SIOCSIFMTU, &ifr) < 0) {
+       syslog(LOG_ERR, "Couldn't set IP MTU: %m");
+    }

 }
 
 /*
 }
 
 /*


@@ -948,7 +960,7 @@ sifnpmode(u, proto, mode)
 
     npi[0] = proto;
     npi[1] = (int) mode;
 
     npi[0] = proto;
     npi[1] = (int) mode;

-    if (strioctl(pppfd, PPPIO_NPMODE, &npi, 2 * sizeof(int), 0) < 0) {
+    if (strioctl(pppfd, PPPIO_NPMODE, npi, 2 * sizeof(int), 0) < 0) {

        syslog(LOG_ERR, "ioctl(set NP %d mode to %d): %m", proto, mode);
        return 0;
     }
        syslog(LOG_ERR, "ioctl(set NP %d mode to %d): %m", proto, mode);
        return 0;
     }


@@ -984,10 +996,12 @@ sifaddr(u, o, h, m)
     if (ioctl(sockfd, SIOCSIFDSTADDR, &ifr) < 0) {
        syslog(LOG_ERR, "Couldn't set remote IP address: %m");
     }
     if (ioctl(sockfd, SIOCSIFDSTADDR, &ifr) < 0) {
        syslog(LOG_ERR, "Couldn't set remote IP address: %m");
     }

+#if 0  /* now done in ppp_send_config */

     ifr.ifr_metric = link_mtu;
     if (ioctl(sockfd, SIOCSIFMTU, &ifr) < 0) {
        syslog(LOG_ERR, "Couldn't set IP MTU: %m");
     }
     ifr.ifr_metric = link_mtu;
     if (ioctl(sockfd, SIOCSIFMTU, &ifr) < 0) {
        syslog(LOG_ERR, "Couldn't set IP MTU: %m");
     }

+#endif

     ifaddrs[0] = o;
     ifaddrs[1] = h;
 
     ifaddrs[0] = o;
     ifaddrs[1] = h;
 


@@ -1021,9 +1035,9 @@ cifaddr(u, o, h)
  * sifdefaultroute - assign a default route through the address given.
  */
 int
  * sifdefaultroute - assign a default route through the address given.
  */
 int

-sifdefaultroute(u, g)
+sifdefaultroute(u, l, g)

     int u;
     int u;

-    u_int32_t g;
+    u_int32_t l, g;

 {
     struct rtentry rt;
 
 {
     struct rtentry rt;
 


@@ -1047,9 +1061,9 @@ sifdefaultroute(u, g)
  * cifdefaultroute - delete a default route through the address given.
  */
 int
  * cifdefaultroute - delete a default route through the address given.
  */
 int

-cifdefaultroute(u, g)
+cifdefaultroute(u, l, g)

     int u;
     int u;

-    u_int32_t g;
+    u_int32_t l, g;

 {
     struct rtentry rt;
 
 {
     struct rtentry rt;
 


@@ -1205,9 +1219,9 @@ get_ether_addr(ipaddr, hwaddr)
 
 #define        WTMPFILE        "/usr/adm/wtmp"
 
 
 #define        WTMPFILE        "/usr/adm/wtmp"
 

-int
+void

 logwtmp(line, name, host)
 logwtmp(line, name, host)

-    char *line, *name, *host;
+    const char *line, *name, *host;

 {
     int fd;
     struct stat buf;
 {
     int fd;
     struct stat buf;