Changeset 6c18c97 in rtems

Timestamp:

05/22/12 10:06:20 (11 years ago)

Author:

Sebastien Bourdeauducq <sebastien@…>

Branches:

4.11, 5, master

Children:

8250503

Parents:

eb1951a

git-author:

Sebastien Bourdeauducq <sebastien@…> (05/22/12 10:06:20)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/06/12 11:30:14)

Message:

network/bootp: PR2031: Add and use header file

Location:

cpukit/libnetworking

Files:

• Makefile.am (modified) (1 diff)
• nfs/bootp_subr.c (modified) (3 diffs)
• rtems/bootp.h (added)
• rtems/rtems_bootp.c (modified) (1 diff)
• rtems/rtems_bsdnet_internal.h (modified) (1 diff)
• rtems/rtems_dhcp.c (modified) (5 diffs)

cpukit/libnetworking/Makefile.am

@@ -5 +5 @@
 
 EXTRA_DIST = README
+EXTRA_DIST += rtems/bootp.h
 
 # poll is not supported

cpukit/libnetworking/nfs/bootp_subr.c

@@ -73 +73 @@
 #include <inttypes.h>
 
+#include "rtems/bootp.h"
+
 #define BOOTP_MIN_LEN           300     /* Minimum size of bootp udp packet */
 
@@ -137 +139 @@
 #endif
 
-int  bootpc_call(struct bootp_packet *call,
-                 struct bootp_packet *reply,
-                 struct proc *procp);
-
-int bootpc_fakeup_interface(struct ifreq *ireq,struct socket *so,
-                        struct proc *procp);
-
-int 
-bootpc_adjust_interface(struct ifreq *ireq,struct socket *so,
-                        struct sockaddr_in *myaddr,
-                        struct sockaddr_in *netmask,
-                        struct sockaddr_in *gw,
-                        struct proc *procp);
-
 #ifdef BOOTP_DEBUG
 void
@@ -270 +258 @@
  * - copy string from src to dest
  */
-static void *bootp_strdup_realloc(char *dst,const char *src)
+void *bootp_strdup_realloc(char *dst,const char *src)
 {
   size_t len;

cpukit/libnetworking/rtems/rtems_bootp.c

@@ -8 +8 @@
 #include <rtems/rtems_bsdnet.h>
 #include <rtems/rtems_bsdnet_internal.h>
+
+#include "rtems/bootp.h"
 
 /*

cpukit/libnetworking/rtems/rtems_bsdnet_internal.h

@@ -174 +174 @@
 void ipintr (void);
 void arpintr (void);
-bool bootpc_init(bool, bool);
 int socket (int, int, int);
 int ioctl (int, ioctl_command_t, ...);

cpukit/libnetworking/rtems/rtems_dhcp.c

@@ -100 +100 @@
 
 #include "rtems/dhcp.h"
+#include "rtems/bootp.h"
 
 #ifndef EALEN
@@ -166 +167 @@
   unsigned char  vend[312];
 };
-
-/*
- * External Declarations for Functions found in
- * rtems/c/src/libnetworking/nfs/
- */
-extern int bootpc_call (struct dhcp_packet *call,
-                        struct dhcp_packet *reply,
-                        struct proc *procp);
-extern int bootpc_fakeup_interface (struct ifreq *ireq,
-                                    struct socket *so,
-                                    struct proc *procp);
-extern int bootpc_adjust_interface (struct ifreq *ireq,
-                                    struct socket *so,
-                                    struct sockaddr_in *myaddr,
-                                    struct sockaddr_in *netmask,
-                                    struct sockaddr_in *gw,
-                                    struct proc *procp);
-extern void *bootp_strdup_realloc (char *dst,
-                                   const char *src);
 
 /*
@@ -756 +738 @@
        * Send the Request.
        */
-      error = bootpc_call (&call, &dhcp_req, procp);
+      error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&dhcp_req, procp);
       if (error) {
         rtems_bsdnet_semaphore_release ();
@@ -961 +943 @@
    * Send the Discover.
    */
-  error = bootpc_call (&call, &reply, procp);
+  error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&reply, procp);
   if (error) {
     printf ("BOOTP call failed -- %s\n", strerror(error));
@@ -990 +972 @@
   dhcp_request_req (&call, &reply, sdl, true);
 
-  error = bootpc_call (&call, &reply, procp);
+  error = bootpc_call ((struct bootp_packet *)&call, (struct bootp_packet *)&reply, procp);
   if (error) {
     printf ("BOOTP call failed -- %s\n", strerror(error));