Changeset 8a4f22e in rtems

Timestamp:

Sep 16, 2007, 4:13:48 AM (12 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

b0ea4a4

Parents:

33eeeb2

Message:

Convert to using C99 fixed-size types instead of BSD fixed-size types.

Location:

cpukit/pppd

Files:

• auth.c (modified) (9 diffs)
• demand.c (modified) (1 diff)
• ipcp.c (modified) (28 diffs)
• ipcp.h (modified) (2 diffs)
• lcp.c (modified) (8 diffs)
• lcp.h (modified) (2 diffs)
• magic.c (modified) (1 diff)
• magic.h (modified) (1 diff)
• options.c (modified) (13 diffs)
• pppd.h (modified) (8 diffs)
• sys-rtems.c (modified) (15 diffs)
• utils.c (modified) (2 diffs)

cpukit/pppd/auth.c

@@ -170 +170 @@
 static int  have_chap_secret(char *, char *, int, int *);
 #if 0
-static int  ip_addr_check(u_int32_t, struct permitted_ip *);
+static int  ip_addr_check(uint32_t, struct permitted_ip *);
 #endif
 static void free_wordlist(struct wordlist *);
@@ -896 +896 @@
     struct hostent *hp;
     struct netent *np;
-    u_int32_t a, mask, ah, offset;
+    uint32_t a, mask, ah, offset;
     struct ipcp_options *wo = &ipcp_wantoptions[unit];
-    u_int32_t suggested_ip = 0;
+    uint32_t suggested_ip = 0;
 
     if (addresses[unit] != NULL)
@@ -937 +937 @@
         }
 
-        mask = ~ (u_int32_t) 0;
+        mask = ~ (uint32_t) 0;
         offset = 0;
         ptr_mask = strchr (ptr_word, '/');
@@ -965 +965 @@
         hp = gethostbyname(ptr_word);
         if (hp != NULL && hp->h_addrtype == AF_INET) {
-            a = *(u_int32_t *)hp->h_addr;
+            a = *(uint32_t *)hp->h_addr;
         } else {
             np = getnetbyname (ptr_word);
@@ -988 +988 @@
             *ptr_mask = '/';
 
-        if (a == (u_int32_t)-1L) {
+        if (a == (uint32_t)-1L) {
             warn("unknown host %s in auth. address list", ap->word);
             continue;
@@ -999 +999 @@
             }
             a = htonl((ntohl(a) & mask) + offset);
-            mask = ~(u_int32_t)0;
+            mask = ~(uint32_t)0;
         }
         ip[n].mask = htonl(mask);
@@ -1031 +1031 @@
 auth_ip_addr(unit, addr)
     int unit;
-    u_int32_t addr;
+    uint32_t addr;
 {
 #if 0
@@ -1058 +1058 @@
 static int
 ip_addr_check(addr, addrs)
-    u_int32_t addr;
+    uint32_t addr;
     struct permitted_ip *addrs;
 {
@@ -1074 +1074 @@
 int
 bad_ip_adrs(addr)
-    u_int32_t addr;
+    uint32_t addr;
 {
     addr = ntohl(addr);

cpukit/pppd/demand.c

@@ -86 +86 @@
     fcs = PPP_INITFCS;
 
-    ppp_send_config(0, PPP_MRU, (u_int32_t) 0, 0, 0);
-    ppp_recv_config(0, PPP_MRU, (u_int32_t) 0, 0, 0);
+    ppp_send_config(0, PPP_MRU, (uint32_t) 0, 0, 0);
+    ppp_recv_config(0, PPP_MRU, (uint32_t) 0, 0, 0);
 
 #ifdef PPP_FILTER

cpukit/pppd/ipcp.c

@@ -177 +177 @@
 static int  ip_demand_conf(int);
 static int  ip_active_pkt(u_char *, int);
-static void create_resolv(u_int32_t, u_int32_t);
+static void create_resolv(uint32_t, uint32_t);
 
 struct protent ipcp_protent = {
@@ -199 +199 @@
 };
 
-static void ipcp_clear_addrs(int, u_int32_t, u_int32_t);
+static void ipcp_clear_addrs(int, uint32_t, uint32_t);
 
 /*
@@ -219 +219 @@
 char *
 ip_ntoa(ipaddr)
-u_int32_t ipaddr;
+uint32_t ipaddr;
 {
     static char b[64];
@@ -258 +258 @@
     char **argv;
 {
-    u_int32_t dns;
+    uint32_t dns;
     struct hostent *hp;
 
     dns = inet_addr(*argv);
-    if (dns == (u_int32_t) -1) {
+    if (dns == (uint32_t) -1) {
         if ((hp = gethostbyname(*argv)) == NULL) {
             option_error("invalid address parameter '%s' for ms-dns option",
@@ -268 +268 @@
             return 0;
         }
-        dns = *(u_int32_t *)hp->h_addr;
+        dns = *(uint32_t *)hp->h_addr;
     }
 
@@ -290 +290 @@
     char **argv;
 {
-    u_int32_t wins;
+    uint32_t wins;
     struct hostent *hp;
 
     wins = inet_addr(*argv);
-    if (wins == (u_int32_t) -1) {
+    if (wins == (uint32_t) -1) {
         if ((hp = gethostbyname(*argv)) == NULL) {
             option_error("invalid address parameter '%s' for ms-wins option",
@@ -300 +300 @@
             return 0;
         }
-        wins = *(u_int32_t *)hp->h_addr;
+        wins = *(uint32_t *)hp->h_addr;
     }
 
@@ -527 +527 @@
         int addrlen = (old? CILEN_ADDRS: CILEN_ADDR); \
         if (len >= addrlen) { \
-            u_int32_t l; \
+            uint32_t l; \
             PUTCHAR(opt, ucp); \
             PUTCHAR(addrlen, ucp); \
@@ -544 +544 @@
     if (neg) { \
         if (len >= CILEN_ADDR) { \
-            u_int32_t l; \
+            uint32_t l; \
             PUTCHAR(opt, ucp); \
             PUTCHAR(CILEN_ADDR, ucp); \
@@ -584 +584 @@
     ipcp_options *go = &ipcp_gotoptions[f->unit];
     u_short cilen, citype, cishort;
-    u_int32_t cilong;
+    uint32_t cilong;
     u_char cimaxslotindex, cicflag;
 
@@ -619 +619 @@
     if (neg) { \
         int addrlen = (old? CILEN_ADDRS: CILEN_ADDR); \
-        u_int32_t l; \
+        uint32_t l; \
         if ((len -= addrlen) < 0) \
             goto bad; \
@@ -641 +641 @@
 #define ACKCIDNS(opt, neg, addr) \
     if (neg) { \
-        u_int32_t l; \
+        uint32_t l; \
         if ((len -= CILEN_ADDR) < 0) \
             goto bad; \
@@ -696 +696 @@
     u_char citype, cilen, *next;
     u_short cishort;
-    u_int32_t ciaddr1, ciaddr2, l, cidnsaddr;
+    uint32_t ciaddr1, ciaddr2, l, cidnsaddr;
     ipcp_options no;            /* options we've seen Naks for */
     ipcp_options try;           /* options to request next time */
@@ -882 +882 @@
     u_char cimaxslotindex, ciflag, cilen;
     u_short cishort;
-    u_int32_t cilong;
+    uint32_t cilong;
     ipcp_options try;           /* options to request next time */
 
@@ -896 +896 @@
         p[1] == cilen && \
         p[0] == opt) { \
-        u_int32_t l; \
+        uint32_t l; \
         len -= cilen; \
         INCPTR(2, p); \
@@ -941 +941 @@
         len >= cilen && \
         p[0] == opt) { \
-        u_int32_t l; \
+        uint32_t l; \
         len -= cilen; \
         INCPTR(2, p); \
@@ -1003 +1003 @@
     u_short cilen, citype;      /* Parsed len, type */
     u_short cishort;            /* Parsed short value */
-    u_int32_t tl, ciaddr1, ciaddr2;/* Parsed address values */
+    uint32_t tl, ciaddr1, ciaddr2;/* Parsed address values */
     int rc = CONFACK;           /* Final packet return code */
     int orc;                    /* Individual option return code */
@@ -1058 +1058 @@
                 orc = CONFNAK;
                 if (!reject_if_disagree) {
-                    DECPTR(sizeof(u_int32_t), p);
+                    DECPTR(sizeof(uint32_t), p);
                     tl = ntohl(wo->hisaddr);
                     PUTLONG(tl, p);
@@ -1081 +1081 @@
                     orc = CONFNAK;
                     if (!reject_if_disagree) {
-                        DECPTR(sizeof(u_int32_t), p);
+                        DECPTR(sizeof(uint32_t), p);
                         tl = ntohl(wo->ouraddr);
                         PUTLONG(tl, p);
@@ -1115 +1115 @@
                 orc = CONFNAK;
                 if (!reject_if_disagree) {
-                    DECPTR(sizeof(u_int32_t), p);
+                    DECPTR(sizeof(uint32_t), p);
                     tl = ntohl(wo->hisaddr);
                     PUTLONG(tl, p);
@@ -1145 +1145 @@
             GETLONG(tl, p);
             if (htonl(tl) != ao->dnsaddr[d]) {
-                DECPTR(sizeof(u_int32_t), p);
+                DECPTR(sizeof(uint32_t), p);
                 tl = ntohl(ao->dnsaddr[d]);
                 PUTLONG(tl, p);
@@ -1165 +1165 @@
             GETLONG(tl, p);
             if (htonl(tl) != ao->winsaddr[d]) {
-                DECPTR(sizeof(u_int32_t), p);
+                DECPTR(sizeof(uint32_t), p);
                 tl = ntohl(ao->winsaddr[d]);
                 PUTLONG(tl, p);
@@ -1284 +1284 @@
 {
     struct hostent *hp;
-    u_int32_t local;
+    uint32_t local;
     ipcp_options *wo = &ipcp_wantoptions[0];
 
@@ -1299 +1299 @@
         wo->accept_local = 1;   /* don't insist on this default value */
         if ((hp = gethostbyname(hostname)) != NULL) {
-            local = *(u_int32_t *)hp->h_addr;
+            local = *(uint32_t *)hp->h_addr;
             if (local != 0 && !bad_ip_adrs(local))
                 wo->ouraddr = local;
@@ -1357 +1357 @@
     fsm *f;
 {
-    u_int32_t mask;
+    uint32_t mask;
     ipcp_options *ho = &ipcp_hisoptions[f->unit];
     ipcp_options *go = &ipcp_gotoptions[f->unit];
@@ -1542 +1542 @@
 ipcp_clear_addrs(unit, ouraddr, hisaddr)
     int unit;
-    u_int32_t ouraddr;  /* local address */
-    u_int32_t hisaddr;  /* remote address */
+    uint32_t ouraddr;  /* local address */
+    uint32_t hisaddr;  /* remote address */
 {
     if (proxy_arp_set[unit]) {
@@ -1572 +1572 @@
 static void
 create_resolv(peerdns1, peerdns2)
-    u_int32_t peerdns1, peerdns2;
+    uint32_t peerdns1, peerdns2;
 {
   /* initialize values */
@@ -1611 +1611 @@
     u_char *pstart, *optend;
     u_short cishort;
-    u_int32_t cilong;
+    uint32_t cilong;
 
     if (plen < HEADERLEN)

cpukit/pppd/ipcp.h

@@ -58 +58 @@
     int  maxslotindex;          /* values for RFC1332 VJ compression neg. */
     bool cflag;
-    u_int32_t ouraddr, hisaddr; /* Addresses in NETWORK BYTE ORDER */
-    u_int32_t dnsaddr[2];       /* Primary and secondary MS DNS entries */
-    u_int32_t winsaddr[2];      /* Primary and secondary MS WINS entries */
+    uint32_t ouraddr, hisaddr;  /* Addresses in NETWORK BYTE ORDER */
+    uint32_t dnsaddr[2];        /* Primary and secondary MS DNS entries */
+    uint32_t winsaddr[2];       /* Primary and secondary MS WINS entries */
 } ipcp_options;
 
@@ -69 +69 @@
 extern ipcp_options ipcp_hisoptions[];
 
-char *ip_ntoa(u_int32_t);
+char *ip_ntoa(uint32_t);
 
 extern struct protent ipcp_protent;

cpukit/pppd/lcp.c

@@ -117 +117 @@
 lcp_options lcp_allowoptions[NUM_PPP];  /* Options we allow peer to request */
 lcp_options lcp_hisoptions[NUM_PPP];    /* Options that we ack'd */
-u_int32_t xmit_accm[NUM_PPP][8];                /* extended transmit ACCM */
+uint32_t xmit_accm[NUM_PPP][8];         /* extended transmit ACCM */
 
 static int lcp_echos_pending = 0;       /* Number of outstanding echo msgs */
@@ -655 +655 @@
     u_char cilen, citype, cichar;
     u_short cishort;
-    u_int32_t cilong;
+    uint32_t cilong;
 
     /*
@@ -786 +786 @@
     u_char citype, cichar, *next;
     u_short cishort;
-    u_int32_t cilong;
+    uint32_t cilong;
     lcp_options no;             /* options we've seen Naks for */
     lcp_options try;            /* options to request next time */
@@ -1097 +1097 @@
     u_char cichar;
     u_short cishort;
-    u_int32_t cilong;
+    uint32_t cilong;
     lcp_options try;            /* options to request next time */
 
@@ -1235 +1235 @@
     int cilen, citype, cichar;  /* Parsed len, type, char value */
     u_short cishort;            /* Parsed short value */
-    u_int32_t cilong;           /* Parse long value */
+    uint32_t cilong;            /* Parse long value */
     int rc = CONFACK;           /* Final packet return code */
     int orc;                    /* Individual option return code */
@@ -1638 +1638 @@
     u_char *pstart, *optend;
     u_short cishort;
-    u_int32_t cilong;
+    uint32_t cilong;
 
     if (plen < HEADERLEN)
@@ -1866 +1866 @@
     int len;
 {
-    u_int32_t magic;
+    uint32_t magic;
 
     /* Check the magic number - don't count replies from ourselves. */
@@ -1892 +1892 @@
     fsm *f;
 {
-    u_int32_t lcp_magic;
+    uint32_t lcp_magic;
     u_char pkt[4], *pktp;
 

cpukit/pppd/lcp.h

@@ -59 +59 @@
     int  mru;                   /* Value of MRU */
     u_char chap_mdtype;         /* which MD type (hashing algorithm) */
-    u_int32_t asyncmap;         /* Value of async map */
-    u_int32_t magicnumber;
+    uint32_t asyncmap;          /* Value of async map */
+    uint32_t magicnumber;
     int numloops;               /* Number of loops during magic number neg. */
-    u_int32_t lqr_period;       /* Reporting period for LQR 1/100ths second */
+    uint32_t lqr_period;        /* Reporting period for LQR 1/100ths second */
 } lcp_options;
 
@@ -70 +70 @@
 extern lcp_options lcp_allowoptions[];
 extern lcp_options lcp_hisoptions[];
-extern u_int32_t xmit_accm[][8];
+extern uint32_t xmit_accm[][8];
 
 #define DEFMRU  1500            /* Try for this */

cpukit/pppd/magic.c

@@ -52 +52 @@
  * magic - Returns the next magic number.
  */
-u_int32_t
+uint32_t
 magic()
 {
-    return (u_int32_t) mrand48();
+    return (uint32_t) mrand48();
 }

cpukit/pppd/magic.h

@@ -21 +21 @@
 
 void magic_init(void);  /* Initialize the magic number generator */
-u_int32_t magic(void);  /* Returns the next magic number */
+uint32_t magic(void);   /* Returns the next magic number */

cpukit/pppd/options.c

@@ -69 +69 @@
 bool    modem = 1;              /* Use modem control lines */
 int     inspeed = 0;            /* Input/Output speed requested */
-u_int32_t netmask = 0;          /* IP netmask to set on interface */
+uint32_t netmask = 0;           /* IP netmask to set on interface */
 bool    lockflag = 0;           /* Create lock file to lock the serial dev */
 bool    nodetach = 0;           /* Don't detach from controlling tty */
@@ -146 +146 @@
 static int process_option(option_t *, char **);
 static int n_arguments(option_t *);
-static int number_option(char *, u_int32_t *, int);
+static int number_option(char *, uint32_t *, int);
 
 /*
@@ -613 +613 @@
     char **argv;
 {
-    u_int32_t v;
+    uint32_t v;
     int iv, a;
     char *sv;
@@ -699 +699 @@
             return 0;
         if (opt->flags & OPT_OR)
-            v |= *(u_int32_t *)(opt->addr);
-        *(u_int32_t *)(opt->addr) = v;
+            v |= *(uint32_t *)(opt->addr);
+        *(uint32_t *)(opt->addr) = v;
         if (opt->addr2 && (opt->flags & OPT_A2COPY))
-            *(u_int32_t *)(opt->addr2) = v;
+            *(uint32_t *)(opt->addr2) = v;
         break;
 
@@ -1059 +1059 @@
 number_option(str, valp, base)
     char *str;
-    u_int32_t *valp;
+    uint32_t *valp;
     int base;
 {
@@ -1084 +1084 @@
     int *valp;
 {
-    u_int32_t v;
+    uint32_t v;
 
     if (!number_option(str, &v, 0))
@@ -1238 +1238 @@
     char *arg;
 {
-  int      spd;
-  uint32_t ret      = (int)1;
-  speed_t  spdValue = (speed_t)0;
+  long     spd;
+  uint32_t ret      = 1;
+  speed_t  spdValue = 0;
   char    *ptr;
 
@@ -1246 +1246 @@
     spd = strtol(arg, &ptr, 0);
     if (ptr == arg || *ptr != 0 || spd == 0) {
-      ret = (int)0;
+      ret = 0;
     }
     else {
@@ -1272 +1272 @@
           break;
         default:
-          ret = (int)0;
+          ret = 0;
           break;
       }
@@ -1351 +1351 @@
     struct hostent *hp;
     char *colon;
-    u_int32_t local, remote;
+    uint32_t local, remote;
     ipcp_options *wo = &ipcp_wantoptions[0];
   
@@ -1367 +1367 @@
     if (colon != arg) {
         *colon = '\0';
-        if ((local = inet_addr(arg)) == (u_int32_t) -1) {
+        if ((local = inet_addr(arg)) == (uint32_t) -1) {
             if ((hp = gethostbyname(arg)) == NULL) {
                 option_error("unknown host: %s", arg);
                 return -1;
             } else {
-                local = *(u_int32_t *)hp->h_addr;
+                local = *(uint32_t *)hp->h_addr;
             }
         }
@@ -1388 +1388 @@
      */
     if (*++colon != '\0') {
-        if ((remote = inet_addr(colon)) == (u_int32_t) -1) {
+        if ((remote = inet_addr(colon)) == (uint32_t) -1) {
             if ((hp = gethostbyname(colon)) == NULL) {
                 option_error("unknown host: %s", colon);
                 return -1;
             } else {
-                remote = *(u_int32_t *)hp->h_addr;
+                remote = *(uint32_t *)hp->h_addr;
                 if (remote_name[0] == 0)
                     strlcpy(remote_name, colon, sizeof(remote_name));
@@ -1417 +1417 @@
     char **argv;
 {
-    u_int32_t mask, b;
+    uint32_t mask, b;
     int n, ok;
     char *p, *endp;

cpukit/pppd/pppd.h

@@ -26 +26 @@
 #include <limits.h>             /* for NGROUPS_MAX */
 #include <sys/param.h>          /* for MAXPATHLEN and BSD4_4, if defined */
-#include <sys/types.h>          /* for u_int32_t, if defined */
+#include <sys/types.h>          /* for uint32_t, if defined */
 #include <sys/time.h>           /* for struct timeval */
 #include <net/ppp_defs.h>
@@ -114 +114 @@
 struct permitted_ip {
     int         permit;         /* 1 = permit, 0 = forbid */
-    u_int32_t   base;           /* match if (addr & mask) == base */
-    u_int32_t   mask;           /* base and mask are in network byte order */
+    uint32_t    base;           /* match if (addr & mask) == base */
+    uint32_t    mask;           /* base and mask are in network byte order */
 };
 
@@ -182 +182 @@
 extern bool     modem;          /* Use modem control lines */
 extern int      inspeed;        /* Input/Output speed requested */
-extern u_int32_t netmask;       /* IP netmask to set on interface */
+extern uint32_t netmask;        /* IP netmask to set on interface */
 extern bool     lockflag;       /* Create lock file to lock the serial dev */
 extern bool     nodetach;       /* Don't detach from controlling tty */
@@ -347 +347 @@
 int  get_secret(int, char *, char *, unsigned char *, int *, int);
                                 /* get "secret" for chap */
-int  auth_ip_addr(int, u_int32_t);
+int  auth_ip_addr(int, uint32_t);
                                 /* check if IP address is authorized */
-int  bad_ip_adrs(u_int32_t);
+int  bad_ip_adrs(uint32_t);
                                 /* check if IP address is unreasonable */
 
@@ -382 +382 @@
 int  read_packet(u_char *); /* Read PPP packet */
 int  get_loop_output(void); /* Read pkts from loopback */
-void ppp_send_config(int, int, u_int32_t, int, int);
+void ppp_send_config(int, int, uint32_t, int, int);
                                 /* Configure i/f transmit parameters */
 void ppp_set_xaccm(int, ext_accm);
                                 /* Set extended transmit ACCM */
-void ppp_recv_config(int, int, u_int32_t, int, int);
+void ppp_recv_config(int, int, uint32_t, int, int);
                                 /* Configure i/f receive parameters */
 int  ccp_test(int, u_char *, int, int);
@@ -403 +403 @@
                                 /* Set mode for handling packets for proto */
 int  sifdown(int);      /* Configure i/f down for one protocol */
-int  sifaddr(int, u_int32_t, u_int32_t, u_int32_t);
+int  sifaddr(int, uint32_t, uint32_t, uint32_t);
                                 /* Configure IPv4 addresses for i/f */
-int  cifaddr(int, u_int32_t, u_int32_t);
+int  cifaddr(int, uint32_t, uint32_t);
                                 /* Reset i/f IP addresses */
 #ifdef INET6
@@ -413 +413 @@
                                 /* Remove an IPv6 address from i/f */
 #endif
-int  sifdefaultroute(int, u_int32_t, u_int32_t);
+int  sifdefaultroute(int, uint32_t, uint32_t);
                                 /* Create default route through i/f */
-int  cifdefaultroute(int, u_int32_t, u_int32_t);
+int  cifdefaultroute(int, uint32_t, uint32_t);
                                 /* Delete default route through i/f */
-int  sifproxyarp(int, u_int32_t);
+int  sifproxyarp(int, uint32_t);
                                 /* Add proxy ARP entry for peer */
-int  cifproxyarp(int, u_int32_t);
+int  cifproxyarp(int, uint32_t);
                                 /* Delete proxy ARP entry for peer */
-u_int32_t GetMask(u_int32_t); /* Get appropriate netmask for address */
+uint32_t GetMask(uint32_t); /* Get appropriate netmask for address */
 int  lock(char *);      /* Create lock file for device */
 int  relock(int);               /* Rewrite lock file with new pid */
@@ -428 +428 @@
                                 /* Write entry to wtmp file */
 int  get_host_seed(void);       /* Get host-dependent random number seed */
-int  have_route_to(u_int32_t); /* Check if route to addr exists */
+int  have_route_to(uint32_t); /* Check if route to addr exists */
 #ifdef PPP_FILTER
 int  set_filters(struct bpf_program *pass, struct bpf_program *active);

cpukit/pppd/sys-rtems.c

@@ -87 +87 @@
 
 static int if_is_up;            /* the interface is currently up */
-static u_int32_t ifaddrs[2];    /* local and remote addresses we set */
-static u_int32_t default_route_gateway; /* gateway addr for default route */
-static u_int32_t proxy_arp_addr;        /* remote addr for proxy arp */
+static uint32_t ifaddrs[2];     /* local and remote addresses we set */
+static uint32_t default_route_gateway;  /* gateway addr for default route */
+static uint32_t proxy_arp_addr; /* remote addr for proxy arp */
 
 /* Prototypes for procedures local to this file. */
-static int dodefaultroute(u_int32_t, int);
-static int get_ether_addr(u_int32_t, struct sockaddr_dl *);
+static int dodefaultroute(uint32_t, int);
+static int get_ether_addr(uint32_t, struct sockaddr_dl *);
 
 
@@ -582 +582 @@
 ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
     int unit, mtu;
-    u_int32_t asyncmap;
+    uint32_t asyncmap;
     int pcomp, accomp;
 {
@@ -626 +626 @@
 ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
     int unit, mru;
-    u_int32_t asyncmap;
+    uint32_t asyncmap;
     int pcomp, accomp;
 {
@@ -875 +875 @@
 sifaddr(u, o, h, m)
     int u;
-    u_int32_t o, h, m;
+    uint32_t o, h, m;
 {
     struct ifaliasreq ifra;
@@ -915 +915 @@
 cifaddr(u, o, h)
     int u;
-    u_int32_t o, h;
+    uint32_t o, h;
 {
     struct ifaliasreq ifra;
@@ -940 +940 @@
 sifdefaultroute(u, l, g)
     int u;
-    u_int32_t l, g;
+    uint32_t l, g;
 {
     return dodefaultroute(g, 's');
@@ -951 +951 @@
 cifdefaultroute(u, l, g)
     int u;
-    u_int32_t l, g;
+    uint32_t l, g;
 {
     return dodefaultroute(g, 'c');
@@ -961 +961 @@
 static int
 dodefaultroute(g, cmd)
-    u_int32_t g;
+    uint32_t g;
     int cmd;
 {
@@ -1026 +1026 @@
 sifproxyarp(unit, hisaddr)
     int unit;
-    u_int32_t hisaddr;
+    uint32_t hisaddr;
 {
     int routes;
@@ -1076 +1076 @@
 cifproxyarp(unit, hisaddr)
     int unit;
-    u_int32_t hisaddr;
+    uint32_t hisaddr;
 {
     int routes;
@@ -1111 +1111 @@
 sifproxyarp(unit, hisaddr)
     int unit;
-    u_int32_t hisaddr;
+    uint32_t hisaddr;
 {
     struct arpreq arpreq;
@@ -1151 +1151 @@
 cifproxyarp(unit, hisaddr)
     int unit;
-    u_int32_t hisaddr;
+    uint32_t hisaddr;
 {
     struct arpreq arpreq;
@@ -1176 +1176 @@
 static int
 get_ether_addr(ipaddr, hwaddr)
-    u_int32_t ipaddr;
+    uint32_t ipaddr;
     struct sockaddr_dl *hwaddr;
 {
     struct ifreq *ifr, *ifend, *ifp;
-    u_int32_t ina, mask;
+    uint32_t ina, mask;
     struct sockaddr_dl *dla;
     struct ifreq ifreq;
@@ -1259 +1259 @@
  * user-specified netmask.
  */
-u_int32_t
+uint32_t
 GetMask(addr)
-    u_int32_t addr;
-{
-    u_int32_t mask, nmask, ina;
+    uint32_t addr;
+{
+    uint32_t mask, nmask, ina;
     struct ifreq *ifr, *ifend, ifreq;
     struct ifconf ifc;
@@ -1324 +1324 @@
  * through our own interface.
  */
-int have_route_to(u_int32_t addr)
+int have_route_to(uint32_t addr)
 {
     return -1;

cpukit/pppd/utils.c

@@ -108 +108 @@
     char num[32];
     time_t t;
-    u_int32_t ip;
+    uint32_t ip;
     static char hexchars[] = "0123456789abcdef";
     struct buffer_info bufinfo;
@@ -198 +198 @@
             break;
         case 'I':
-            ip = va_arg(args, u_int32_t);
+            ip = va_arg(args, uint32_t);
             ip = ntohl(ip);
             slprintf(num, sizeof(num), "%d.%d.%d.%d", (ip >> 24) & 0xff,