Merge pull request ARMmbed#2399 from ARMmbed/IOTTHD-4220

Add EDFE mode to Socket API setsockopt

Author: Arto Kinnunen

nanostack/socket_api.h

@@ -712,11 +712,12 @@ static inline int8_t socket_read_session_address(int8_t socket, ns_address_t *ad
  * | SOCKET_IPV6_MULTICAST_LOOP   | bool              |     Yes         |   Yes   | No                                |
  * | SOCKET_IPV6_JOIN_GROUP       | ns_ipv6_mreq_t    |     Set only    |   No    | No                                |
  * | SOCKET_IPV6_LEAVE_GROUP      | ns_ipv6_mreq_t    |     Set only    |   No    | No                                |
+ * | SOCKET_LATENCY               | ns_ipv6_latency_t |     Get only    |   No    | No                                |
+ * | SOCKET_STAGGER               | ns_ipv6_stagger_t |     Get only    |   No    | No                                |
+ * | SOCKET_EDFE_MODE             | bool              |     Set only    |   No    | No                                |
  * | SOCKET_BROADCAST_PAN         | int8_t            |     Yes         |   No    | No                                |
  * | SOCKET_LINK_LAYER_SECURITY   | int8_t            |     Yes         |   No    | No                                |
  * | SOCKET_INTERFACE_SELECT      | int8_t            |     Yes         |   No    | No                                |
- * | SOCKET_LATENCY               | ns_ipv6_latency_t |     Get only    |   No    | No                                |
- * | SOCKET_STAGGER               | ns_ipv6_stagger_t |     Get only    |   No    | No                                |
  *
  */
 
@@ -755,11 +756,10 @@ static inline int8_t socket_read_session_address(int8_t socket, ns_address_t *ad
 #define SOCKET_IPV6_JOIN_GROUP              15
 /** Leave a multicast group, using ns_ipv6_mreq_t */
 #define SOCKET_IPV6_LEAVE_GROUP             16
-/** Read estimated latency to reach destination */
-#define SOCKET_LATENCY                      17
-/** Read estimated stagger value that can be used as initial delay after bootstrap or firmware update. */
-#define SOCKET_STAGGER                      18
 
+#define SOCKET_LATENCY                      0xf9 /**< Not standard, read estimated latency to reach destination */
+#define SOCKET_STAGGER                      0xfa /**< Not standard, read estimated stagger value that can be used as initial delay after bootstrap or firmware update. */
+#define SOCKET_EDFE_MODE                    0xfb /**< Not standard, Extended Directed Frame Exchange mode enabled/disabled in MAC layer */
 #define SOCKET_BROADCAST_PAN                0xfc /**< Internal use - transmit with IEEE 802.15.4 broadcast PAN ID */
 #define SOCKET_LINK_LAYER_SECURITY          0xfd /**< Not standard enable or disable socket security at link layer (For 802.15.4). */
 #define SOCKET_INTERFACE_SELECT             0xfe /**< Not standard socket interface ID. */

source/6LoWPAN/ws/ws_empty_functions.c

@@ -380,6 +380,14 @@ int ws_test_next_gtk_set(int8_t interface_id, uint8_t *gtk[4])
     return -1;
 }
 
+int ws_test_6lowpan_fragmentation_mtu_size_set(int8_t interface_id, uint16_t mtu_size)
+{
+    (void) interface_id;
+    (void) mtu_size;
+
+    return -1;
+}
+
 int ws_statistics_start(int8_t interface_id, ws_statistics_t *stats_ptr)
 {
     (void) interface_id;

source/Core/include/ns_buffer.h

@@ -124,6 +124,7 @@ typedef struct buffer_options {
     bool    need_predecessor: 1;        /*!< Used as an indicator that predecessor address needed */
     bool    multicast_loop: 1;          /*!< We want loopback if we're a group member (TX), or this IS the loopback if RX */
     bool    mpl_permitted: 1;           /*!< MPL will be used if enabled on interface and scope >=3 */
+    bool    edfe_mode: 1;               /*!< Use Extended Directed Frame Exchange pattern in MAC layer */
 #ifndef NO_IP_FRAGMENT_TX
     bool    ipv6_dontfrag: 1;           /*!< Don't IPv6 fragment (RFC 3542) */
 #endif

source/Core/include/ns_socket.h

@@ -177,6 +177,7 @@ typedef struct inet_pcb_s {
     bool        recvpktinfo: 1;
     bool        recvhoplimit: 1;
     bool        recvtclass: 1;
+    bool        edfe_mode: 1;
     int_least24_t flow_label;
     NS_LIST_HEAD(inet_group_t, link) mc_groups;
 } inet_pcb_t;

source/Core/ns_socket.c

@@ -401,6 +401,8 @@ inet_pcb_t *socket_inet_pcb_allocate(void)
     inet_pcb->recvhoplimit = false;
     inet_pcb->recvpktinfo = false;
     inet_pcb->recvtclass = false;
+    inet_pcb->edfe_mode = false;
+
     inet_pcb->link_layer_security = -1;
 #ifndef NO_IPV6_PMTUD
     inet_pcb->use_min_mtu = -1;
@@ -1134,6 +1136,7 @@ int16_t socket_buffer_sendmsg(int8_t sid, buffer_t *buf, const struct ns_msghdr
     buf->options.ipv6_use_min_mtu = inet_pcb->use_min_mtu;
     buf->options.ipv6_dontfrag = inet_pcb->dontfrag;
     buf->options.multicast_loop = inet_pcb->multicast_loop;
+    buf->options.edfe_mode = inet_pcb->edfe_mode;
 
     /* Set default remote address from PCB */
     if (inet_pcb->remote_port != 0 && !addr_ipv6_equal(inet_pcb->remote_address, ns_in6addr_any)) {

source/libNET/src/socket_api.c

@@ -960,6 +960,13 @@ static int8_t ipv6_setsockopt(socket_t *socket_ptr, uint8_t opt_name, const void
             inet_pcb->recvtclass = *(const bool *) opt_value;
             return 0;
         }
+        case SOCKET_EDFE_MODE: {
+            if (opt_len != sizeof(bool)) {
+                return -3;
+            }
+            inet_pcb->edfe_mode = *(const bool *) opt_value;
+            return 0;
+        }
         default:
             return -2;
     }