Changeset 395a6f6d in rtems

Timestamp:

May 12, 2005, 12:37:25 PM (15 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

ec5880b6

Parents:

c3fdc332

Message:

Partial update from FreeBSD.

File:

• cpukit/libnetworking/net/route.h (modified) (3 diffs)

cpukit/libnetworking/net/route.h

@@ -108 +108 @@
 #define rt_mask(r)      ((struct sockaddr *)((r)->rt_nodes->rn_mask))
         struct  sockaddr *rt_gateway;   /* value */
-        short   rt_filler;              /* was short flags field */
-        short   rt_refcnt;              /* # held references */
         u_long  rt_flags;               /* up/down?, host/net */
         struct  ifnet *rt_ifp;          /* the answer: interface to use */
-        struct  ifaddr *rt_ifa;         /* the answer: interface to use */
+        struct  ifaddr *rt_ifa;         /* the answer: interface address to use */
+        struct  rt_metrics rt_rmx;      /* metrics used by rx'ing protocols */
+        long    rt_refcnt;              /* # held references */
         struct  sockaddr *rt_genmask;   /* for generation of cloned routes */
         caddr_t rt_llinfo;              /* pointer to link level info cache */
-        struct  rt_metrics rt_rmx;      /* metrics used by rx'ing protocols */
         struct  rtentry *rt_gwroute;    /* implied entry for gatewayed routes */
         int     (*rt_output) __P((struct ifnet *, struct mbuf *,
@@ -121 +120 @@
                                         /* output routine for this (rt,if) */
         struct  rtentry *rt_parent;     /* cloning parent of this route */
-        void    *rt_filler2;            /* more filler */
 };
 
@@ -281 +279 @@
 
 void     route_init __P((void));
-void     rt_ifmsg __P((struct ifnet *));
-void     rt_missmsg __P((int, struct rt_addrinfo *, int, int));
-void     rt_newaddrmsg __P((int, struct ifaddr *, int, struct rtentry *));
-int      rt_setgate __P((struct rtentry *,
-            struct sockaddr *, struct sockaddr *));
-void     rtalloc __P((struct route *));
+void     rt_ifmsg(struct ifnet *);
+void     rt_missmsg(int, struct rt_addrinfo *, int, int);
+void     rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *);
+int      rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *);
 void     rtalloc_ign __P((struct route *, unsigned long));
+void     rtalloc(struct route *ro); /* XXX deprecated, use rtalloc_ign(ro, 0) */
 struct rtentry *
          rtalloc1 __P((struct sockaddr *, int, unsigned long));
-void     rtfree __P((struct rtentry *));
-int      rtinit __P((struct ifaddr *, int, int));
+void     rtfree(struct rtentry *);
+int      rtinit(struct ifaddr *, int, int);
 int      rtioctl __P((int, caddr_t, struct proc *));
-void     rtredirect __P((struct sockaddr *, struct sockaddr *,
-            struct sockaddr *, int, struct sockaddr *, struct rtentry **));
-int      rtrequest __P((int, struct sockaddr *,
-            struct sockaddr *, struct sockaddr *, int, struct rtentry **));
+void     rtredirect(struct sockaddr *, struct sockaddr *,
+            struct sockaddr *, int, struct sockaddr *, struct rtentry **);
+int      rtrequest(int, struct sockaddr *,
+            struct sockaddr *, struct sockaddr *, int, struct rtentry **);
 #endif