mirror of
git://projects.qi-hardware.com/wernermisc.git
synced 2024-12-19 11:17:10 +02:00
fe7a334808
- synchronized patch set with http://www.milkymist.org/wiki/index.php?title=Pending_RTEMS_PRs - switched from using RTEMS CVS to git - commented out patches already applied in git - updated softusb-input.h update process
189 lines
5.9 KiB
Diff
189 lines
5.9 KiB
Diff
commit c4fc8e1f7ebc16926a7b2c64cb433bf03408a04f
|
|
Author: Sebastien Bourdeauducq <sebastien@milkymist.org>
|
|
Date: Fri Feb 24 21:57:21 2012 +0100
|
|
|
|
BOOTP/DHCP header cleanup
|
|
|
|
diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c
|
|
index 4021bc6..df8b0c5 100644
|
|
--- a/cpukit/libnetworking/nfs/bootp_subr.c
|
|
+++ b/cpukit/libnetworking/nfs/bootp_subr.c
|
|
@@ -71,9 +71,12 @@
|
|
#include <fcntl.h>
|
|
#include <rtems/mkrootfs.h>
|
|
#include <rtems/rtems_bsdnet.h>
|
|
+#include <rtems/rtems_bsdnet_internal.h>
|
|
#include <rtems/bsdnet/servers.h>
|
|
#include <inttypes.h>
|
|
|
|
+#include "rtems/bootp.h"
|
|
+
|
|
#define BOOTP_MIN_LEN 300 /* Minimum size of bootp udp packet */
|
|
|
|
/*
|
|
@@ -138,20 +141,6 @@ void bootpboot_p_rtlist(void);
|
|
void bootpboot_p_iflist(void);
|
|
#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
|
|
bootpboot_p_sa(struct sockaddr *sa, struct sockaddr *ma)
|
|
@@ -271,7 +260,7 @@ bootpboot_p_iflist(void)
|
|
* - allocate or reallocate dst, so that string fits in
|
|
* - 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;
|
|
|
|
diff --git a/cpukit/libnetworking/rtems/bootp.h b/cpukit/libnetworking/rtems/bootp.h
|
|
new file mode 100644
|
|
index 0000000..21bdb79
|
|
--- /dev/null
|
|
+++ b/cpukit/libnetworking/rtems/bootp.h
|
|
@@ -0,0 +1,39 @@
|
|
+/* Subroutines from c/src/libnetworking/nfs/bootp_subr.c */
|
|
+
|
|
+#if !defined (__RTEMS_BOOTP_H__)
|
|
+#define __RTEMS_BOOTP_H__
|
|
+
|
|
+#if __cplusplus
|
|
+extern "C"
|
|
+{
|
|
+#endif
|
|
+
|
|
+struct bootp_packet;
|
|
+struct proc;
|
|
+struct ifreq;
|
|
+struct socket;
|
|
+struct sockaddr_in;
|
|
+
|
|
+bool bootpc_init(bool, bool);
|
|
+
|
|
+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);
|
|
+
|
|
+void *bootp_strdup_realloc(char *dst, const char *src);
|
|
+
|
|
+#if __cplusplus
|
|
+}
|
|
+#endif
|
|
+
|
|
+#endif
|
|
diff --git a/cpukit/libnetworking/rtems/rtems_bootp.c b/cpukit/libnetworking/rtems/rtems_bootp.c
|
|
index caf2faa..6a644a4 100644
|
|
--- a/cpukit/libnetworking/rtems/rtems_bootp.c
|
|
+++ b/cpukit/libnetworking/rtems/rtems_bootp.c
|
|
@@ -12,6 +12,8 @@
|
|
#include <rtems/rtems_bsdnet.h>
|
|
#include <rtems/rtems_bsdnet_internal.h>
|
|
|
|
+#include "rtems/bootp.h"
|
|
+
|
|
/*
|
|
* Perform a BOOTP request
|
|
*/
|
|
diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
|
|
index c8bdfd4..9721e1c 100644
|
|
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
|
|
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
|
|
@@ -179,7 +179,6 @@ void domaininit (void *);
|
|
void ifinit (void *);
|
|
void ipintr (void);
|
|
void arpintr (void);
|
|
-bool bootpc_init(bool, bool);
|
|
int socket (int, int, int);
|
|
int ioctl (int, ioctl_command_t, ...);
|
|
|
|
diff --git a/cpukit/libnetworking/rtems/rtems_dhcp.c b/cpukit/libnetworking/rtems/rtems_dhcp.c
|
|
index e01846e..285ce1e 100644
|
|
--- a/cpukit/libnetworking/rtems/rtems_dhcp.c
|
|
+++ b/cpukit/libnetworking/rtems/rtems_dhcp.c
|
|
@@ -99,6 +99,7 @@
|
|
#include <rtems/mkrootfs.h>
|
|
|
|
#include "rtems/dhcp.h"
|
|
+#include "rtems/bootp.h"
|
|
|
|
#ifndef EALEN
|
|
#define EALEN 6
|
|
@@ -167,25 +168,6 @@ struct dhcp_packet
|
|
};
|
|
|
|
/*
|
|
- * 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);
|
|
-
|
|
-/*
|
|
* Variables
|
|
*/
|
|
static int dhcp_option_overload = 0;
|
|
@@ -724,7 +706,7 @@ dhcp_task (rtems_task_argument _sdl)
|
|
/*
|
|
* 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 ();
|
|
printf ("DHCP call failed -- error %d", error);
|
|
@@ -918,7 +900,7 @@ dhcp_init (int update_files)
|
|
/*
|
|
* 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));
|
|
soclose (so);
|
|
@@ -947,7 +929,7 @@ dhcp_init (int update_files)
|
|
*/
|
|
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));
|
|
soclose (so);
|