Merge branch 'master' of https://github.com/RT-Thread/rt-thread

4 files changed, 70 insertions, 1 deletions

diff --git a/components/dfs/filesystems/lwip/netinet/tcp.h b/components/dfs/filesystems/lwip/netinet/tcp.h
new file mode 100644
index 0000000000..c157b0bb38
--- /dev/null
+++ b/components/dfs/filesystems/lwip/netinet/tcp.h
@@ -0,0 +1,30 @@
+/*
+ * File      : tcp.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2015, RT-Thread Development Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2015-02-17     Bernard      First version
+ */
+
+#ifndef TCP_H__
+#define TCP_H__
+
+#include <lwip/sockets.h>
+
+#endif
diff --git a/components/dfs/filesystems/lwip/netinet/udp.h b/components/dfs/filesystems/lwip/netinet/udp.h
new file mode 100644
index 0000000000..6eef3ee774
--- /dev/null
+++ b/components/dfs/filesystems/lwip/netinet/udp.h
@@ -0,0 +1,30 @@
+/*
+ * File      : udp.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2015, RT-Thread Development Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2015-02-17     Bernard      First version
+ */
+
+#ifndef UDP_H__
+#define UDP_H__
+
+#include <lwip/sockets.h>
+
+#endif
diff --git a/components/dfs/filesystems/lwip/sys/socket.h b/components/dfs/filesystems/lwip/sys/socket.h
index 9a789ca094..5317e05e4c 100644
--- a/components/dfs/filesystems/lwip/sys/socket.h
+++ b/components/dfs/filesystems/lwip/sys/socket.h
@@ -31,6 +31,14 @@ extern "C" {
 
 #include <lwip/sockets.h>
 
+typedef uint16_t sa_family_t;
+
+struct sockaddr_storage
+{
+    sa_family_t ss_family;       /* Address family */
+    char        ss_data[14];     /* 14-bytes of address data */
+};
+
 int accept(int s, struct sockaddr *addr, socklen_t *addrlen);
 int bind(int s, const struct sockaddr *name, socklen_t namelen);
 int shutdown(int s, int how);
diff --git a/src/mem.c b/src/mem.c
index 004de01d94..c45059c5cd 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -304,6 +304,7 @@ void *rt_malloc(rt_size_t size)
 
                 /* create mem2 struct */
                 mem2       = (struct heap_mem *)&heap_ptr[ptr2];
+                mem2->magic = HEAP_MAGIC;
                 mem2->used = 0;
                 mem2->next = mem->next;
                 mem2->prev = ptr;
@@ -540,7 +541,7 @@ void rt_free(void *rmem)
     RT_ASSERT(mem->magic == HEAP_MAGIC);
     /* ... and is now unused. */
     mem->used  = 0;
-    mem->magic = 0;
+    mem->magic = HEAP_MAGIC;
 
     if (mem < lfree)
     {