Changeset 4ca43d72 in rtems

Timestamp:

01/20/05 17:00:38 (19 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

1147a65

Parents:

982c61cc

Message:

2005-01-20 Joel Sherrill <joel@…>

PR 736/pppd

• libnetworking/pppd/chat.c, libnetworking/pppd/demand.c, libnetworking/pppd/pppd.h, libnetworking/pppd/rtemsmain.c, libnetworking/pppd/sys-rtems.c, libnetworking/pppd/utils.c: ttyfd should not be static and should have a name more specific to pppd.

Files:

• c/src/ChangeLog (modified) (1 diff)
• c/src/libnetworking/pppd/chat.c (modified) (7 diffs)
• c/src/libnetworking/pppd/demand.c (modified) (1 diff)
• c/src/libnetworking/pppd/pppd.h (modified) (2 diffs)
• c/src/libnetworking/pppd/rtemsmain.c (modified) (11 diffs)
• c/src/libnetworking/pppd/sys-rtems.c (modified) (3 diffs)
• c/src/libnetworking/pppd/utils.c (modified) (2 diffs)
• cpukit/pppd/chat.c (modified) (7 diffs)
• cpukit/pppd/demand.c (modified) (1 diff)
• cpukit/pppd/pppd.h (modified) (2 diffs)
• cpukit/pppd/rtemsmain.c (modified) (11 diffs)
• cpukit/pppd/sys-rtems.c (modified) (3 diffs)
• cpukit/pppd/utils.c (modified) (2 diffs)

c/src/ChangeLog

@@ +1 @@
+2005-01-20      Joel Sherrill <joel@OARcorp.com>
+
+        PR 736/pppd
+        * libnetworking/pppd/chat.c, libnetworking/pppd/demand.c,
+        libnetworking/pppd/pppd.h, libnetworking/pppd/rtemsmain.c,
+        libnetworking/pppd/sys-rtems.c, libnetworking/pppd/utils.c: ttyfd
+        should not be static and should have a name more specific to pppd.
+
 2005-01-07      Ralf Corsepius <ralf.corsepius@rtems.org>
 

c/src/libnetworking/pppd/chat.c

@@ -164 +164 @@
 static char *phone_num      = (char *) 0;
 static char *phone_num2     = (char *) 0;
-static int ttyfd;
+/* static */ int pppd_ttyfd;
 static int timeout   = DEFAULT_CHAT_TIMEOUT;
 
@@ -247 +247 @@
   /* initialize exit code */
   exit_code = 0;
-  ttyfd     = fd;
+  pppd_ttyfd     = fd;
 
   script=pScript;
@@ -272 +272 @@
     }
   }
-  ttyfd = (int)-1;
+  pppd_ttyfd = (int)-1;
 
   return ( exit_code );
@@ -279 +279 @@
 void break_sequence()
 {
-  tcsendbreak(ttyfd, 0);
+  tcsendbreak(pppd_ttyfd, 0);
 }
 
@@ -700 +700 @@
         while(tries)
         {
-            status = read(ttyfd, &c, 1);
+            status = read(pppd_ttyfd, &c, 1);
             switch (status) {
                    case 1:
@@ -716 +716 @@
   char ch = c;
 
-  return(write(ttyfd, &ch, 1));
+  return(write(pppd_ttyfd, &ch, 1));
 }
 
@@ -792 +792 @@
     memset(temp2, 0, sizeof(temp2));
 
-    tcgetattr(ttyfd, &tios);
+    tcgetattr(pppd_ttyfd, &tios);
     tios.c_cc[VMIN] = 0;
     tios.c_cc[VTIME] = timeout*10/MAX_TIMEOUTS;
-    tcsetattr(ttyfd, TCSANOW, &tios);
+    tcsetattr(pppd_ttyfd, TCSANOW, &tios);
                 
     string = clean(in_string, 0);

c/src/libnetworking/pppd/demand.c

@@ -46 +46 @@
 static const char rcsid[] = RCSID;
 
-static char *frame;
+static unsigned char *frame;
 static int framelen;
 static int framemax;

c/src/libnetworking/pppd/pppd.h

@@ -142 +142 @@
 extern int      pppifunit;      /* Interface unit number */
 extern char     ifname[];       /* Interface name */
-extern int      ttyfd;          /* Serial device file descriptor */
+extern int      pppd_ttyfd;     /* Serial device file descriptor */
 extern char     hostname[];     /* Our hostname */
 extern u_char   outpacket_buf[]; /* Buffer for outgoing packets */
@@ -302 +302 @@
 void log_packet __P((u_char *, int, char *, int));
                                 /* Format a packet and log it with syslog */
-void print_string __P((char *, int,  void (*) (void *, char *, ...),
+void print_string __P((void *, int,  void (*) (void *, char *, ...),
                 void *));       /* Format a string for output */
 int slprintf __P((char *, int, char *, ...));           /* sprintf++ */

c/src/libnetworking/pppd/rtemsmain.c

@@ -78 +78 @@
 static char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */
 
-int ttyfd;                      /* Serial port file descriptor */
+/* int pppd_ttyfd;                      * Serial port file descriptor */
 int baud_rate;                  /* Actual bits/second for serial device */
 int hungup;                     /* terminal has been hung up */
@@ -233 +233 @@
 
         need_holdoff = 1;
-        ttyfd = -1;
+        pppd_ttyfd = -1;
         real_ttyfd = -1;
         pppd_status = EXIT_OK;
@@ -265 +265 @@
                    user before opening it. */
                 int err;
-                ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);
+                pppd_ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);
                 err = errno;
-                if (ttyfd >= 0) {
+                if (pppd_ttyfd >= 0) {
                     break;
                 }
@@ -278 +278 @@
                     goto fail;
             }
-            if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1
-                || fcntl(ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
+            if ((fdflags = fcntl(pppd_ttyfd, F_GETFL)) == -1
+                || fcntl(pppd_ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
                 warn("Couldn't reset non-blocking mode on device: %m");
 
@@ -292 +292 @@
              * we could clear CLOCAL at this point.
              */
-            set_up_tty(ttyfd, ((connector != NULL && connector[0] != 0)
+            set_up_tty(pppd_ttyfd, ((connector != NULL && connector[0] != 0)
                                || initializer != NULL));
-            real_ttyfd = ttyfd;
+            real_ttyfd = pppd_ttyfd;
         }
 
@@ -309 +309 @@
 
             if (initializer && initializer[0]) {
-                if (device_script(ttyfd, DIALER_INIT, initializer) < 0) {
+                if (device_script(pppd_ttyfd, DIALER_INIT, initializer) < 0) {
                     error("Initializer script failed");
                     pppd_status = EXIT_INIT_FAILED;
@@ -321 +321 @@
 
             if (connector && connector[0]) {
-                if (device_script(ttyfd, DIALER_CONNECT, connector) < 0) {
+                if (device_script(pppd_ttyfd, DIALER_CONNECT, connector) < 0) {
                     error("Connect script failed");
                     pppd_status = EXIT_CONNECT_FAILED;
@@ -361 +361 @@
         /* run welcome script, if any */
         if (welcomer && welcomer[0]) {
-            if (device_script(ttyfd, DIALER_WELCOME, welcomer) < 0)
+            if (device_script(pppd_ttyfd, DIALER_WELCOME, welcomer) < 0)
                 warn("Welcome script failed");
         }
 
         /* set up the serial device as a ppp interface */
-        fd_ppp = establish_ppp(ttyfd);
+        fd_ppp = establish_ppp(pppd_ttyfd);
         if (fd_ppp < 0) {
             pppd_status = EXIT_FATAL_ERROR;
@@ -416 +416 @@
         if (demand)
             restore_loop();
-        disestablish_ppp(ttyfd);
+        disestablish_ppp(pppd_ttyfd);
         fd_ppp = -1;
         if (!hungup)
@@ -430 +430 @@
             if (real_ttyfd >= 0)
                 set_up_tty(real_ttyfd, 1);
-            if (device_script(ttyfd, DIALER_DISCONNECT, disconnect_script) < 0) {
+            if (device_script(pppd_ttyfd, DIALER_DISCONNECT, disconnect_script) < 0) {
                 warn("disconnect script failed");
             } else {
@@ -686 +686 @@
 
     if (fd_ppp >= 0)
-        disestablish_ppp(ttyfd);
+        disestablish_ppp(pppd_ttyfd);
     if (real_ttyfd >= 0)
         close_tty();

c/src/libnetworking/pppd/sys-rtems.c

@@ -489 +489 @@
 /*    printf("sent packet [%d]\n", len); */
 
-    if (write(ttyfd, p, len) < 0) {
+    if (write(pppd_ttyfd, p, len) < 0) {
         if (errno != EIO)
             error("write: %m");
@@ -532 +532 @@
     int len;
 
-    if ((len = read(ttyfd, buf, PPP_MTU + PPP_HDRLEN)) < 0) {
+    if ((len = read(pppd_ttyfd, buf, PPP_MTU + PPP_HDRLEN)) < 0) {
         if (errno == EWOULDBLOCK || errno == EINTR) len = -1;
         /*fatal("read: %m"); */
@@ -650 +650 @@
     data.length = opt_len;
     data.transmit = for_transmit;
-    if (ioctl(ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
+    if (ioctl(pppd_ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
         return 1;
     return (errno == ENOBUFS)? 0: -1;

c/src/libnetworking/pppd/utils.c

@@ -469 +469 @@
  */
 void
-print_string(p, len, printer, arg)
-    char *p;
+print_string(p_arg, len, printer, arg)
+    void *p_arg;
     int len;
     void (*printer) __P((void *, char *, ...));
@@ -476 +476 @@
 {
     int c;
+    unsigned char *p = (unsigned char *)p_arg;
 
     printer(arg, "\"");

cpukit/pppd/chat.c

@@ -164 +164 @@
 static char *phone_num      = (char *) 0;
 static char *phone_num2     = (char *) 0;
-static int ttyfd;
+/* static */ int pppd_ttyfd;
 static int timeout   = DEFAULT_CHAT_TIMEOUT;
 
@@ -247 +247 @@
   /* initialize exit code */
   exit_code = 0;
-  ttyfd     = fd;
+  pppd_ttyfd     = fd;
 
   script=pScript;
@@ -272 +272 @@
     }
   }
-  ttyfd = (int)-1;
+  pppd_ttyfd = (int)-1;
 
   return ( exit_code );
@@ -279 +279 @@
 void break_sequence()
 {
-  tcsendbreak(ttyfd, 0);
+  tcsendbreak(pppd_ttyfd, 0);
 }
 
@@ -700 +700 @@
         while(tries)
         {
-            status = read(ttyfd, &c, 1);
+            status = read(pppd_ttyfd, &c, 1);
             switch (status) {
                    case 1:
@@ -716 +716 @@
   char ch = c;
 
-  return(write(ttyfd, &ch, 1));
+  return(write(pppd_ttyfd, &ch, 1));
 }
 
@@ -792 +792 @@
     memset(temp2, 0, sizeof(temp2));
 
-    tcgetattr(ttyfd, &tios);
+    tcgetattr(pppd_ttyfd, &tios);
     tios.c_cc[VMIN] = 0;
     tios.c_cc[VTIME] = timeout*10/MAX_TIMEOUTS;
-    tcsetattr(ttyfd, TCSANOW, &tios);
+    tcsetattr(pppd_ttyfd, TCSANOW, &tios);
                 
     string = clean(in_string, 0);

cpukit/pppd/demand.c

@@ -46 +46 @@
 static const char rcsid[] = RCSID;
 
-static char *frame;
+static unsigned char *frame;
 static int framelen;
 static int framemax;

cpukit/pppd/pppd.h

@@ -142 +142 @@
 extern int      pppifunit;      /* Interface unit number */
 extern char     ifname[];       /* Interface name */
-extern int      ttyfd;          /* Serial device file descriptor */
+extern int      pppd_ttyfd;     /* Serial device file descriptor */
 extern char     hostname[];     /* Our hostname */
 extern u_char   outpacket_buf[]; /* Buffer for outgoing packets */
@@ -302 +302 @@
 void log_packet __P((u_char *, int, char *, int));
                                 /* Format a packet and log it with syslog */
-void print_string __P((char *, int,  void (*) (void *, char *, ...),
+void print_string __P((void *, int,  void (*) (void *, char *, ...),
                 void *));       /* Format a string for output */
 int slprintf __P((char *, int, char *, ...));           /* sprintf++ */

cpukit/pppd/rtemsmain.c

@@ -78 +78 @@
 static char ppp_devnam[MAXPATHLEN]; /* name of PPP tty (maybe ttypx) */
 
-int ttyfd;                      /* Serial port file descriptor */
+/* int pppd_ttyfd;                      * Serial port file descriptor */
 int baud_rate;                  /* Actual bits/second for serial device */
 int hungup;                     /* terminal has been hung up */
@@ -233 +233 @@
 
         need_holdoff = 1;
-        ttyfd = -1;
+        pppd_ttyfd = -1;
         real_ttyfd = -1;
         pppd_status = EXIT_OK;
@@ -265 +265 @@
                    user before opening it. */
                 int err;
-                ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);
+                pppd_ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0);
                 err = errno;
-                if (ttyfd >= 0) {
+                if (pppd_ttyfd >= 0) {
                     break;
                 }
@@ -278 +278 @@
                     goto fail;
             }
-            if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1
-                || fcntl(ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
+            if ((fdflags = fcntl(pppd_ttyfd, F_GETFL)) == -1
+                || fcntl(pppd_ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
                 warn("Couldn't reset non-blocking mode on device: %m");
 
@@ -292 +292 @@
              * we could clear CLOCAL at this point.
              */
-            set_up_tty(ttyfd, ((connector != NULL && connector[0] != 0)
+            set_up_tty(pppd_ttyfd, ((connector != NULL && connector[0] != 0)
                                || initializer != NULL));
-            real_ttyfd = ttyfd;
+            real_ttyfd = pppd_ttyfd;
         }
 
@@ -309 +309 @@
 
             if (initializer && initializer[0]) {
-                if (device_script(ttyfd, DIALER_INIT, initializer) < 0) {
+                if (device_script(pppd_ttyfd, DIALER_INIT, initializer) < 0) {
                     error("Initializer script failed");
                     pppd_status = EXIT_INIT_FAILED;
@@ -321 +321 @@
 
             if (connector && connector[0]) {
-                if (device_script(ttyfd, DIALER_CONNECT, connector) < 0) {
+                if (device_script(pppd_ttyfd, DIALER_CONNECT, connector) < 0) {
                     error("Connect script failed");
                     pppd_status = EXIT_CONNECT_FAILED;
@@ -361 +361 @@
         /* run welcome script, if any */
         if (welcomer && welcomer[0]) {
-            if (device_script(ttyfd, DIALER_WELCOME, welcomer) < 0)
+            if (device_script(pppd_ttyfd, DIALER_WELCOME, welcomer) < 0)
                 warn("Welcome script failed");
         }
 
         /* set up the serial device as a ppp interface */
-        fd_ppp = establish_ppp(ttyfd);
+        fd_ppp = establish_ppp(pppd_ttyfd);
         if (fd_ppp < 0) {
             pppd_status = EXIT_FATAL_ERROR;
@@ -416 +416 @@
         if (demand)
             restore_loop();
-        disestablish_ppp(ttyfd);
+        disestablish_ppp(pppd_ttyfd);
         fd_ppp = -1;
         if (!hungup)
@@ -430 +430 @@
             if (real_ttyfd >= 0)
                 set_up_tty(real_ttyfd, 1);
-            if (device_script(ttyfd, DIALER_DISCONNECT, disconnect_script) < 0) {
+            if (device_script(pppd_ttyfd, DIALER_DISCONNECT, disconnect_script) < 0) {
                 warn("disconnect script failed");
             } else {
@@ -686 +686 @@
 
     if (fd_ppp >= 0)
-        disestablish_ppp(ttyfd);
+        disestablish_ppp(pppd_ttyfd);
     if (real_ttyfd >= 0)
         close_tty();

cpukit/pppd/sys-rtems.c

@@ -489 +489 @@
 /*    printf("sent packet [%d]\n", len); */
 
-    if (write(ttyfd, p, len) < 0) {
+    if (write(pppd_ttyfd, p, len) < 0) {
         if (errno != EIO)
             error("write: %m");
@@ -532 +532 @@
     int len;
 
-    if ((len = read(ttyfd, buf, PPP_MTU + PPP_HDRLEN)) < 0) {
+    if ((len = read(pppd_ttyfd, buf, PPP_MTU + PPP_HDRLEN)) < 0) {
         if (errno == EWOULDBLOCK || errno == EINTR) len = -1;
         /*fatal("read: %m"); */
@@ -650 +650 @@
     data.length = opt_len;
     data.transmit = for_transmit;
-    if (ioctl(ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
+    if (ioctl(pppd_ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
         return 1;
     return (errno == ENOBUFS)? 0: -1;

cpukit/pppd/utils.c

@@ -469 +469 @@
  */
 void
-print_string(p, len, printer, arg)
-    char *p;
+print_string(p_arg, len, printer, arg)
+    void *p_arg;
     int len;
     void (*printer) __P((void *, char *, ...));
@@ -476 +476 @@
 {
     int c;
+    unsigned char *p = (unsigned char *)p_arg;
 
     printer(arg, "\"");