riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8537 from smlng/pkg/emb6/fix_patching

Browse Source 
pkg/emb6: fix patching with newer git version
This commit is contained in:
Martine Lenders 2018-02-15 14:40:04 +01:00 committed by GitHub
commit 16c3961377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 196 additions and 943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/emb6/patches/0001-Add-RIOT-Makefiles.patch
View File

@ -1,4 +1,4 @@
From 4b417436908a6823e631519f794a20644a467f19 Mon Sep 17 00:00:00 2001
From 5322d1d2280283f108f27a1720cbf6b4f958d21c Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Mon, 11 Jan 2016 15:09:34 +0100
Subject: [PATCH 1/4] Add RIOT Makefiles
@ -30,14 +30,14 @@ Subject: [PATCH 1/4] Add RIOT Makefiles
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..48422e9
index 00000000..48422e90
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/Makefile b/emb6/Makefile
new file mode 100644
index 0000000..c2ec39f
index 00000000..c2ec39f3
--- /dev/null
+++ b/emb6/Makefile
@@ -0,0 +1,3 @@
@ -46,7 +46,7 @@ index 0000000..c2ec39f
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/mac/Makefile b/emb6/src/mac/Makefile
new file mode 100644
index 0000000..d0472d8
index 00000000..d0472d85
--- /dev/null
+++ b/emb6/src/mac/Makefile
@@ -0,0 +1,3 @@
@ -55,7 +55,7 @@ index 0000000..d0472d8
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/mac/llsec/Makefile b/emb6/src/mac/llsec/Makefile
new file mode 100644
index 0000000..e13ee7f
index 00000000..e13ee7f1
--- /dev/null
+++ b/emb6/src/mac/llsec/Makefile
@@ -0,0 +1,3 @@
@ -64,7 +64,7 @@ index 0000000..e13ee7f
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/ipv6/Makefile b/emb6/src/net/ipv6/Makefile
new file mode 100644
index 0000000..844e39c
index 00000000..844e39cd
--- /dev/null
+++ b/emb6/src/net/ipv6/Makefile
@@ -0,0 +1,3 @@
@ -73,7 +73,7 @@ index 0000000..844e39c
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/ipv6/multicast/Makefile b/emb6/src/net/ipv6/multicast/Makefile
new file mode 100644
index 0000000..f1c3f1e
index 00000000..f1c3f1e0
--- /dev/null
+++ b/emb6/src/net/ipv6/multicast/Makefile
@@ -0,0 +1,3 @@
@ -82,7 +82,7 @@ index 0000000..f1c3f1e
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/rpl/Makefile b/emb6/src/net/rpl/Makefile
new file mode 100644
index 0000000..2fd941c
index 00000000..2fd941c7
--- /dev/null
+++ b/emb6/src/net/rpl/Makefile
@@ -0,0 +1,3 @@
@ -91,7 +91,7 @@ index 0000000..2fd941c
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/net/sicslowpan/Makefile b/emb6/src/net/sicslowpan/Makefile
new file mode 100644
index 0000000..9e14df3
index 00000000..9e14df33
--- /dev/null
+++ b/emb6/src/net/sicslowpan/Makefile
@@ -0,0 +1,3 @@
@ -100,7 +100,7 @@ index 0000000..9e14df3
+include $(RIOTBASE)/Makefile.base
diff --git a/emb6/src/tport/Makefile b/emb6/src/tport/Makefile
new file mode 100644
index 0000000..1b0ca7c
index 00000000..1b0ca7c2
--- /dev/null
+++ b/emb6/src/tport/Makefile
@@ -0,0 +1,3 @@
@ -109,7 +109,7 @@ index 0000000..1b0ca7c
+include $(RIOTBASE)/Makefile.base
diff --git a/target/bsp/Makefile b/target/bsp/Makefile
new file mode 100644
index 0000000..ce548bd
index 00000000..ce548bd1
--- /dev/null
+++ b/target/bsp/Makefile
@@ -0,0 +1,3 @@
@ -118,13 +118,13 @@ index 0000000..ce548bd
+include $(RIOTBASE)/Makefile.base
diff --git a/utils/src/Makefile b/utils/src/Makefile
new file mode 100644
index 0000000..c9aa897
index 00000000..c9aa8979
--- /dev/null
+++ b/utils/src/Makefile
@@ -0,0 +1,3 @@
+MODULE := emb6_utils
+
+include $(RIOTBASE)/Makefile.base
--
1.9.1
--
2.16.1

1015
pkg/emb6/patches/0002-Rename-colliding-files-and-functions.patch
View File

File diff suppressed because it is too large Load Diff

82
pkg/emb6/patches/0003-Fix-warnings.patch
View File

@ -1,4 +1,4 @@
From cb47e0b69b747833322a83b7396878a631add116 Mon Sep 17 00:00:00 2001
From 47663dee3ce27b96a9556e710c973a8fb0990b3b Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Fri, 5 Feb 2016 00:46:31 +0100
Subject: [PATCH 3/4] Fix warnings
@ -18,13 +18,13 @@ Subject: [PATCH 3/4] Fix warnings
11 files changed, 365 insertions(+), 77 deletions(-)
diff --git a/emb6/src/net/ipv6/multicast/roll-tm.c b/emb6/src/net/ipv6/multicast/roll-tm.c
index 8b36300..96f4f47 100644
index 8b363009..96f4f473 100644
--- a/emb6/src/net/ipv6/multicast/roll-tm.c
+++ b/emb6/src/net/ipv6/multicast/roll-tm.c
@@ -290,12 +290,17 @@ struct mcast_packet {
#define MCAST_PACKET_S_BIT 0x20 /* Must Send Next Pass */
#define MCAST_PACKET_L_BIT 0x10 /* Is listed in ICMP message */
+static inline struct uip_ip_hdr *_to_ip_hdr(void *ptr)
+{
+ return (struct uip_ip_hdr *)ptr;
@ -38,7 +38,7 @@ index 8b36300..96f4f47 100644
- ((seed_id_t *)&((struct uip_ip_hdr *)&(p)->buff[UIP_LLH_LEN])->srcipaddr)
+ ((seed_id_t *)&(((struct uip_ip_hdr *)&(p))->buff[UIP_LLH_LEN])->srcipaddr)
#endif
/**
@@ -303,7 +308,7 @@ struct mcast_packet {
* p: pointer to a packet buffer
@ -46,7 +46,7 @@ index 8b36300..96f4f47 100644
#define MCAST_PACKET_TTL(p) \
- (((struct uip_ip_hdr *)(p)->buff)->ttl)
+ (_to_ip_hdr((p)->buff)->ttl)
/**
* \brief Set 'Is Used' bit for packet p
@@ -462,14 +467,55 @@ static uint16_t last_seq;
@ -174,7 +174,7 @@ index 8b36300..96f4f47 100644
-out()
+out(void)
{
if(uip_len + HBHO_TOTAL_LEN > UIP_BUFSIZE) {
@@ -1391,7 +1437,7 @@ drop:
}
@ -186,7 +186,7 @@ index 8b36300..96f4f47 100644
/*
* We call accept() which will sort out caching and forwarding. Depending
diff --git a/emb6/src/net/ipv6/multicast/smrf.c b/emb6/src/net/ipv6/multicast/smrf.c
index 9b4a3a5..38d31cd 100644
index 9b4a3a51..38d31cd2 100644
--- a/emb6/src/net/ipv6/multicast/smrf.c
+++ b/emb6/src/net/ipv6/multicast/smrf.c
@@ -77,7 +77,13 @@ static uint8_t fwd_spread;
@ -223,7 +223,7 @@ index 9b4a3a5..38d31cd 100644
return;
}
diff --git a/emb6/src/net/ipv6/multicast/uip-mcast6-route.c b/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
index 55d245d..75443a5 100644
index 995ff0c9..a397a675 100644
--- a/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
+++ b/emb6/src/net/ipv6/multicast/uip-mcast6-route.c
@@ -126,7 +126,7 @@ uip_mcast6_route_count(void)
@ -236,13 +236,13 @@ index 55d245d..75443a5 100644
memb_init(&mcast_route_memb);
list_init(mcast_route_list);
diff --git a/emb6/src/net/ipv6/tcpip.c b/emb6/src/net/ipv6/tcpip.c
index 9c76bed..1901d9e 100644
index 9c76bed9..1901d9eb 100644
--- a/emb6/src/net/ipv6/tcpip.c
+++ b/emb6/src/net/ipv6/tcpip.c
@@ -72,9 +72,24 @@ void uip_log(char *msg);
#define UIP_LOG(m)
#endif
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[UIP_LLIPH_LEN + uip_ext_len])
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_TCP_BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
@ -264,12 +264,12 @@ index 9c76bed..1901d9e 100644
+#define UIP_ICMP_BUF (uip_icmp_buf())
+#define UIP_IP_BUF (uip_ip_buf())
+#define UIP_TCP_BUF (uip_tcp_buf())
#ifdef UIP_FALLBACK_INTERFACE
extern struct uip_fallback_interface UIP_FALLBACK_INTERFACE;
@@ -165,15 +180,15 @@ unsigned char tcpip_is_forwarding; /* Forwarding right now? */
//PROCESS(tcpip_process, "TCP/IP stack");
/*---------------------------------------------------------------------------*/
+#if UIP_TCP
static void
@ -286,13 +286,13 @@ index 9c76bed..1901d9e 100644
static void
check_for_tcp_syn(void)
diff --git a/emb6/src/net/ipv6/uip-icmp6.c b/emb6/src/net/ipv6/uip-icmp6.c
index 484d0bf..6f53d12 100644
index 2d8b4858..3fbe9f81 100644
--- a/emb6/src/net/ipv6/uip-icmp6.c
+++ b/emb6/src/net/ipv6/uip-icmp6.c
@@ -59,11 +59,34 @@
#define PRINT6ADDR(addr)
#endif
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_ICMP6_ERROR_BUF ((struct uip_icmp6_error *)&uip_buf[uip_l2_l3_icmp_hdr_len])
@ -326,7 +326,7 @@ index 484d0bf..6f53d12 100644
+#define UIP_ICMP6_ERROR_BUF (uip_icmp6_error_buf())
+#define UIP_EXT_BUF (uip_ext_buf())
+#define UIP_FIRST_EXT_BUF (uip_first_ext_buf())
/** \brief temporary IP address */
static uip_ipaddr_t tmp_ipaddr;
@@ -409,7 +432,7 @@ UIP_ICMP6_HANDLER(echo_reply_handler, ICMP6_ECHO_REPLY,
@ -339,13 +339,13 @@ index 484d0bf..6f53d12 100644
/* Register Echo Request and Reply handlers */
uip_icmp6_register_input_handler(&echo_request_handler);
diff --git a/emb6/src/net/ipv6/uip-nd6.c b/emb6/src/net/ipv6/uip-nd6.c
index f04b6b3..26ed214 100644
index f04b6b34..26ed2146 100644
--- a/emb6/src/net/ipv6/uip-nd6.c
+++ b/emb6/src/net/ipv6/uip-nd6.c
@@ -93,6 +93,37 @@ void uip_log(char *msg);
#define UIP_LOG(m)
#endif /* UIP_LOGGING == 1 */
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_ip_hdr *uip_ip_buf(void)
+{
@ -383,7 +383,7 @@ index f04b6b3..26ed214 100644
@@ -106,19 +137,19 @@ void uip_log(char *msg);
* value of these length variables
*/
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) /**< Pointer to IP header */
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) /**< Pointer to ICMP header*/
+#define UIP_IP_BUF (uip_ip_buf()) /**< Pointer to IP header */
@ -408,7 +408,7 @@ index f04b6b3..26ed214 100644
+#define UIP_ND6_OPT_MTU_BUF (uip_nd6_opt_mtu_buf())
+#define UIP_ND6_OPT_RDNSS_BUF (uip_nd6_opt_rdnss_buf())
/** @} */
static uint8_t nd6_opt_offset; /** Offset from the end of the icmpv6 header to the option in uip_buf*/
@@ -132,6 +163,27 @@ static uip_ds6_prefix_t *prefix; /** Pointer to a prefix list entry */
static uip_ds6_nbr_t *nbr; /** Pointer to a nbr cache entry*/
@ -436,7 +436,7 @@ index f04b6b3..26ed214 100644
+}
+
/*------------------------------------------------------------------*/
/* create a llao */
/* create a llao */
static void
@@ -1054,7 +1106,7 @@ UIP_ICMP6_HANDLER(ra_input_handler, ICMP6_RA, UIP_ICMP6_HANDLER_CODE_ANY,
#endif
@ -445,16 +445,16 @@ index f04b6b3..26ed214 100644
-uip_nd6_init()
+uip_nd6_init(void)
{
#if UIP_ND6_SEND_NA
diff --git a/emb6/src/net/ipv6/uip6.c b/emb6/src/net/ipv6/uip6.c
index 89edb73..281c8d9 100644
index 89edb739..281c8d93 100644
--- a/emb6/src/net/ipv6/uip6.c
+++ b/emb6/src/net/ipv6/uip6.c
@@ -152,6 +152,61 @@ uint8_t uip_ext_len = 0;
uint8_t uip_ext_opt_offset = 0;
/** @} */
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_ip_hdr *uip_ip_buf(void) {
+ return ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]);
@ -553,20 +553,20 @@ index 89edb73..281c8d9 100644
@@ -647,6 +702,9 @@ static uint8_t uip_reassflags;
#define UIP_REASS_FLAG_FIRSTFRAG 0x02
#define UIP_REASS_FLAG_ERROR_MSG 0x04
+static inline struct uip_tcpip_hdr *fbuf(void) {
+ return ((struct uip_tcpip_hdr *)&uip_reassbuf[0]);
+}
/*
* See RFC 2460 for a description of fragmentation in IPv6
diff --git a/emb6/src/net/rpl/rpl-ext-header.c b/emb6/src/net/rpl/rpl-ext-header.c
index 8bf1fe1..a680d52 100644
index 8bf1fe19..a680d521 100644
--- a/emb6/src/net/rpl/rpl-ext-header.c
+++ b/emb6/src/net/rpl/rpl-ext-header.c
@@ -56,13 +56,49 @@
#include <string.h>
/*---------------------------------------------------------------------------*/
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len])
@ -622,13 +622,13 @@ index 8bf1fe1..a680d52 100644
int
rpl_verify_header(int uip_ext_opt_offset)
diff --git a/emb6/src/net/rpl/rpl-icmp6.c b/emb6/src/net/rpl/rpl-icmp6.c
index 0675e63..84eb5bd 100644
index 0675e632..84eb5bde 100644
--- a/emb6/src/net/rpl/rpl-icmp6.c
+++ b/emb6/src/net/rpl/rpl-icmp6.c
@@ -68,9 +68,25 @@
#define RPL_DIO_MOP_MASK 0x38
#define RPL_DIO_PREFERENCE_MASK 0x07
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_ICMP_BUF ((struct uip_icmp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-#define UIP_ICMP_PAYLOAD ((unsigned char *)&uip_buf[uip_l2_l3_icmp_hdr_len])
@ -664,7 +664,7 @@ index 0675e63..84eb5bd 100644
uip_icmp6_register_input_handler(&dis_handler);
uip_icmp6_register_input_handler(&dio_handler);
diff --git a/emb6/src/net/sicslowpan/sicslowpan.c b/emb6/src/net/sicslowpan/sicslowpan.c
index 79afefe..529c6f4 100644
index 79afefed..529c6f45 100644
--- a/emb6/src/net/sicslowpan/sicslowpan.c
+++ b/emb6/src/net/sicslowpan/sicslowpan.c
@@ -161,13 +161,34 @@ void uip_log(char *msg);
@ -696,7 +696,7 @@ index 79afefe..529c6f4 100644
+
+#define SICSLOWPAN_IP_BUF (sicslowpan_ip_buf())
+#define SICSLOWPAN_UDP_BUF (sicslowpan_udp_buf())
-#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLIPH_LEN])
-#define UIP_TCP_BUF ((struct uip_tcp_hdr *)&uip_buf[UIP_LLIPH_LEN])
@ -706,12 +706,12 @@ index 79afefe..529c6f4 100644
+#define UIP_TCP_BUF (uip_tcp_buf())
+#define UIP_ICMP_BUF (uip_icmp_buf())
/** @} */
@@ -282,6 +303,16 @@ static s_ns_t* p_ns = NULL;
/*-------------------------------------------------------------------------*/
static struct rime_sniffer *callback = NULL;
+struct uip_ip_hdr *sicslowpan_ip_buf(void)
+{
+ return ((struct uip_ip_hdr *)&sicslowpan_buf[UIP_LLH_LEN]);
@ -727,7 +727,7 @@ index 79afefe..529c6f4 100644
{
@@ -295,7 +326,7 @@ rime_sniffer_remove(struct rime_sniffer *s)
}
static void
-set_packet_attrs()
+set_packet_attrs(void)
@ -735,13 +735,13 @@ index 79afefe..529c6f4 100644
int c = 0;
/* set protocol in NETWORK_ID */
diff --git a/emb6/src/tport/udp-socket.c b/emb6/src/tport/udp-socket.c
index 545f6bd..3980716 100644
index 545f6bde..39807169 100644
--- a/emb6/src/tport/udp-socket.c
+++ b/emb6/src/tport/udp-socket.c
@@ -44,7 +44,12 @@ void _udp_sock_callback(c_event_t c_event, p_data_t p_data);
static uint8_t buf[UIP_BUFSIZE];
-#define UIP_IP_BUF ((struct uip_udpip_hdr *)&uip_buf[UIP_LLH_LEN])
+/* least intrusive way to prevent -Wstrict-aliasing from firing */
+static inline struct uip_udpip_hdr *uip_ip_buf(void) {
@ -749,9 +749,9 @@ index 545f6bd..3980716 100644
+}
+
+#define UIP_IP_BUF (uip_ip_buf())
#define LOGGER_ENABLE LOGGER_CORE
#if LOGGER_ENABLE == TRUE
--
1.9.1
--
2.16.1

14
pkg/emb6/patches/0004-Provide-event-type-for-RIOT-s-conn_.-_send.patch → pkg/emb6/patches/0004-Provide-event-type-for-RIOT-s-sock_.-_send.patch
View File

@ -1,4 +1,4 @@
From 6b0721c0d546652238c139f0d41790cb77996442 Mon Sep 17 00:00:00 2001
From 0e12b41bfc8283be079ce2bb9469713932eeacb7 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Fri, 26 Feb 2016 12:35:52 +0100
Subject: [PATCH 4/4] Provide event type for RIOT's sock_.*_send
@ -8,7 +8,7 @@ Subject: [PATCH 4/4] Provide event type for RIOT's sock_.*_send
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/utils/inc/evproc.h b/utils/inc/evproc.h
index 5316a67..78153be 100644
index 5316a67e..883a1366 100644
--- a/utils/inc/evproc.h
+++ b/utils/inc/evproc.h
@@ -79,6 +79,7 @@
@ -17,7 +17,7 @@ index 5316a67..78153be 100644
EVENT_TYPE_SLIP_POLL, \
+ EVENT_TYPE_SOCK_SEND, \
EVENT_TYPE_PCK_LL }
#define EVENT_TYPE_NONE 0x00 ///< No event
@@ -89,11 +90,12 @@
#define EVENT_TYPE_ICMP6 0x05 ///< New icmp6 packet event
@ -26,13 +26,13 @@ index 5316a67..78153be 100644
+#define EVENT_TYPE_SOCK_SEND 0x08 ///< Send command from sock layer
#define OBLIG_EVENT_PRIOR 0x0a
#define EVENT_TYPE_PCK_LL 0x0a ///< New low level packet received
-#define EVENT_TYPES_COUNT 8 ///< Counter of events in /ref EVENT_TYPES macro
+#define EVENT_TYPES_COUNT 9 ///< Counter of events in /ref EVENT_TYPES macro
#define MAX_CALLBACK_COUNT 7 ///< Maximal amount of callbacks in /ref st_funcRegList_t list
#define EVPROC_QUEUE_SIZE 20 ///< Maximal amount of events in /ref pst_evList queue
/*=============================================================================
--
1.9.1
--
2.16.1