qi-hardware/wernermisc
1
0
Fork 0
mirror of git://projects.qi-hardware.com/wernermisc.git synced 2025-04-21 12:27:27 +03:00
Code Activity

m1/patches/rtems: refresh

Browse Source
This commit is contained in:
Xiangfu
2012-05-14 12:36:46 +08:00
parent 9a316150b4
commit b6b61b1702
4 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
m1/patches/rtems/fix-dns-in-dhcp.patch
View File

@@ -4,11 +4,11 @@ Date: Fri Feb 24 23:04:56 2012 +0100
Fix incorrect processing of DNS info from DHCP (revised patch)
diff --git a/cpukit/libnetworking/rtems/rtems_dhcp.c b/cpukit/libnetworking/rtems/rtems_dhcp.c
index 285ce1e..4039a48 100644
--- a/cpukit/libnetworking/rtems/rtems_dhcp.c
+++ b/cpukit/libnetworking/rtems/rtems_dhcp.c
@@ -187,6 +187,35 @@ static const char dhcp_request_parameters[5] = { DHCP_SUBNET,
Index: rtems/cpukit/libnetworking/rtems/rtems_dhcp.c
===================================================================
--- rtems.orig/cpukit/libnetworking/rtems/rtems_dhcp.c 2012-05-14 12:34:47.363444000 +0800
+++ rtems/cpukit/libnetworking/rtems/rtems_dhcp.c 2012-05-14 12:35:04.922660000 +0800
@@ -205,6 +205,35 @@
DHCP_DNS,
DHCP_HOST,
DHCP_DOMAIN_NAME };
@@ -44,7 +44,7 @@ index 285ce1e..4039a48 100644
/*
* Format an IP address in dotted decimal.
@@ -345,10 +374,12 @@ process_options (unsigned char *optbuf, int optbufSize)
@@ -363,10 +392,12 @@
{
int dlen = 0;
while ((dlen < len) &&
@@ -60,7 +60,7 @@ index 285ce1e..4039a48 100644
memcpy (&rtems_bsdnet_nameserver
[rtems_bsdnet_nameserver_count], p + dlen, 4);
rtems_bsdnet_nameserver_count++;
@@ -725,6 +756,15 @@ dhcp_task (rtems_task_argument _sdl)
@@ -743,6 +774,15 @@
continue;
}
@@ -76,7 +76,7 @@ index 285ce1e..4039a48 100644
process_options (&dhcp_req.vend[4], sizeof (dhcp_req.vend) - 4);
if (dhcp_message_type != DHCP_ACK)
@@ -839,6 +879,8 @@ dhcp_init (int update_files)
@@ -857,6 +897,8 @@
struct sockaddr_dl *sdl = NULL;
struct proc *procp = NULL;