The process is polled when a udp packet is sent

The application can now use the tcpip_udp_sent_event to know when a
udp packet has finished sending. The data for the event also contains
the status code from the MAC layer.

Author: bkozak-scanimetrics

core/net/ip/tcpip.c

@@ -73,6 +73,7 @@ extern struct uip_fallback_interface UIP_FALLBACK_INTERFACE;
 #endif
 
 process_event_t tcpip_event;
+process_event_t tcpip_udp_sent_event;
 #if UIP_CONF_ICMP6
 process_event_t tcpip_icmp6_event;
 #endif /* UIP_CONF_ICMP6 */
@@ -109,22 +110,22 @@ enum {
 /* Called on IP packet output. */
 #if NETSTACK_CONF_WITH_IPV6
 
-static uint8_t (* outputfunc)(const uip_lladdr_t *a);
+static uint8_t (*outputfunc)(const uip_lladdr_t *a, struct tcpip_sent *sent);
 
 uint8_t
-tcpip_output(const uip_lladdr_t *a)
+tcpip_output(const uip_lladdr_t *a, struct tcpip_sent *sent)
 {
   int ret;
   if(outputfunc != NULL) {
-    ret = outputfunc(a);
+    ret = outputfunc(a, sent);
     return ret;
   }
   UIP_LOG("tcpip_output: Use tcpip_set_outputfunc() to set an output function");
   return 0;
 }
 
 void
-tcpip_set_outputfunc(uint8_t (*f)(const uip_lladdr_t *))
+tcpip_set_outputfunc(uint8_t (*f)(const uip_lladdr_t *, struct tcpip_sent *))
 {
   outputfunc = f;
 }
@@ -147,7 +148,16 @@ tcpip_set_outputfunc(uint8_t (*f)(void))
   outputfunc = f;
 }
 #endif
+/*---------------------------------------------------------------------------*/
+static void
+tcpip_udp_sent_callback(struct tcpip_sent *sent, int status)
+{
+  struct uip_udp_conn *conn = sent->ptr;
+  struct tcpip_udp_sent_status data = { conn, status };
 
+  process_post_synch(conn->appstate.p, tcpip_udp_sent_event, &data);
+}
+/*---------------------------------------------------------------------------*/
 #if UIP_CONF_IP_FORWARD
 unsigned char tcpip_is_forwarding; /* Forwarding right now? */
 #endif /* UIP_CONF_IP_FORWARD */
@@ -321,6 +331,8 @@ udp_new(const uip_ipaddr_t *ripaddr, uint16_t port, void *appstate)
   s = &c->appstate;
   s->p = PROCESS_CURRENT();
   s->state = appstate;
+  s->sent.ptr = c;
+  s->sent.callback = tcpip_udp_sent_callback;
 
   return c;
 }
@@ -537,7 +549,7 @@ tcpip_input(void)
 /*---------------------------------------------------------------------------*/
 #if NETSTACK_CONF_WITH_IPV6
 void
-tcpip_ipv6_output(void)
+tcpip_ipv6_output_sent(struct tcpip_sent *sent)
 {
   uip_ds6_nbr_t *nbr = NULL;
   uip_ipaddr_t *nexthop;
@@ -702,7 +714,7 @@ tcpip_ipv6_output(void)
       }
 #endif /* UIP_ND6_SEND_NA */
 
-      tcpip_output(uip_ds6_nbr_get_ll(nbr));
+      tcpip_output(uip_ds6_nbr_get_ll(nbr), sent);
 
 #if UIP_CONF_IPV6_QUEUE_PKT
       /*
@@ -715,7 +727,7 @@ tcpip_ipv6_output(void)
         uip_len = uip_packetqueue_buflen(&nbr->packethandle);
         memcpy(UIP_IP_BUF, uip_packetqueue_buf(&nbr->packethandle), uip_len);
         uip_packetqueue_free(&nbr->packethandle);
-        tcpip_output(uip_ds6_nbr_get_ll(nbr));
+        tcpip_output(uip_ds6_nbr_get_ll(nbr), sent);
       }
 #endif /*UIP_CONF_IPV6_QUEUE_PKT*/
 
@@ -725,7 +737,7 @@ tcpip_ipv6_output(void)
     return;
   }
   /* Multicast IP destination address. */
-  tcpip_output(NULL);
+  tcpip_output(NULL, sent);
   uip_len = 0;
   uip_ext_len = 0;
 }
@@ -808,6 +820,8 @@ PROCESS_THREAD(tcpip_process, ev, data)
 #endif
 
   tcpip_event = process_alloc_event();
+  tcpip_udp_sent_event = process_alloc_event();
+
 #if UIP_CONF_ICMP6
   tcpip_icmp6_event = process_alloc_event();
 #endif /* UIP_CONF_ICMP6 */

core/net/ip/tcpip.h

@@ -71,9 +71,20 @@
 
 struct uip_conn;
 
+struct tcpip_sent {
+  void (*callback)(struct tcpip_sent *, int);
+  void *ptr;
+};
+
+struct tcpip_udp_sent_status {
+  struct uip_udp_conn *conn;
+  int status;
+};
+
 struct tcpip_uipstate {
   struct process *p;
   void *state;
+  struct tcpip_sent sent;
 };
 
 #define UIP_APPCALL tcpip_uipcall
@@ -275,7 +286,7 @@ struct uip_udp_conn *udp_broadcast_new(uint16_t port, void *appstate);
 CCIF void tcpip_poll_udp(struct uip_udp_conn *conn);
 
 /** @} */
- 
+
 /**
  * \name ICMPv6 functions
  * @{
@@ -319,6 +330,14 @@ void tcpip_icmp6_call(uint8_t type);
  * This event is posted to a process whenever a uIP event has occurred.
  */
 CCIF extern process_event_t tcpip_event;
+/** @} */
+/**
+ * The udp sent event
+ *
+ * This event is posted to a process whenever a udp packet has finished sending
+ * (possibly as a result of error).
+ */
+CCIF extern process_event_t tcpip_udp_sent_event;
 
 /**
  * \name TCP/IP packet processing
@@ -341,8 +360,10 @@ CCIF void tcpip_input(void);
  * The eventual parameter is the MAC address of the destination.
  */
 #if NETSTACK_CONF_WITH_IPV6
-uint8_t tcpip_output(const uip_lladdr_t *);
-void tcpip_set_outputfunc(uint8_t (* f)(const uip_lladdr_t *));
+uint8_t tcpip_output(const uip_lladdr_t *, struct tcpip_sent *ptr);
+void tcpip_set_outputfunc(
+  uint8_t (*f)(const uip_lladdr_t *, struct tcpip_sent *)
+  );
 #else
 uint8_t tcpip_output(void);
 void tcpip_set_outputfunc(uint8_t (* f)(void));
@@ -352,7 +373,8 @@ void tcpip_set_outputfunc(uint8_t (* f)(void));
  * \brief This function does address resolution and then calls tcpip_output
  */
 #if NETSTACK_CONF_WITH_IPV6
-void tcpip_ipv6_output(void);
+void tcpip_ipv6_output_sent(struct tcpip_sent* sent);
+#define tcpip_ipv6_output() tcpip_ipv6_output_sent(NULL)
 #endif
 
 /**

core/net/ip/uip-udp-packet.c

@@ -67,7 +67,7 @@ uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len)
 #endif /* UIP_IPV6_MULTICAST */
 
 #if NETSTACK_CONF_WITH_IPV6
-    tcpip_ipv6_output();
+    tcpip_ipv6_output_sent(&(c->appstate.sent));
 #else
     if(uip_len > 0) {
       tcpip_output();

core/net/ipv6/sicslowpan.c

@@ -1314,6 +1314,12 @@ packet_sent(void *ptr, int status, int transmissions)
   if(callback != NULL) {
     callback->output_callback(status);
   }
+
+  if(ptr) {
+    struct tcpip_sent *sent = ptr;
+    sent->callback(sent, status);
+  }
+
   last_tx_status = status;
 }
 /*--------------------------------------------------------------------*/
@@ -1323,7 +1329,7 @@ packet_sent(void *ptr, int status, int transmissions)
  * \param dest the link layer destination address of the packet
  */
 static void
-send_packet(linkaddr_t *dest)
+send_packet(linkaddr_t *dest,struct tcpip_sent *sent)
 {
   /* Set the link layer destination address for the packet as a
    * packetbuf attribute. The MAC layer can access the destination
@@ -1338,7 +1344,7 @@ send_packet(linkaddr_t *dest)
 
   /* Provide a callback function to receive the result of
      a packet transmission. */
-  NETSTACK_LLSEC.send(&packet_sent, NULL);
+  NETSTACK_LLSEC.send(&packet_sent, sent);
 
   /* If we are sending multiple packets in a row, we need to let the
      watchdog know that we are still alive. */
@@ -1355,7 +1361,7 @@ send_packet(linkaddr_t *dest)
  *  MAC.
  */
 static uint8_t
-output(const uip_lladdr_t *localdest)
+output(const uip_lladdr_t *localdest, struct tcpip_sent* sent)
 {
   int framer_hdrlen;
   int max_payload;
@@ -1495,7 +1501,7 @@ output(const uip_lladdr_t *localdest)
       PRINTFO("could not allocate queuebuf for first fragment, dropping packet\n");
       return 0;
     }
-    send_packet(&dest);
+    send_packet(&dest, sent);
     queuebuf_to_packetbuf(q);
     queuebuf_free(q);
     q = NULL;
@@ -1541,7 +1547,7 @@ output(const uip_lladdr_t *localdest)
         PRINTFO("could not allocate queuebuf, dropping fragment\n");
         return 0;
       }
-      send_packet(&dest);
+      send_packet(&dest, sent);
       queuebuf_to_packetbuf(q);
       queuebuf_free(q);
       q = NULL;
@@ -1568,7 +1574,7 @@ output(const uip_lladdr_t *localdest)
     memcpy(packetbuf_ptr + packetbuf_hdr_len, (uint8_t *)UIP_IP_BUF + uncomp_hdr_len,
            uip_len - uncomp_hdr_len);
     packetbuf_set_datalen(uip_len - uncomp_hdr_len + packetbuf_hdr_len);
-    send_packet(&dest);
+    send_packet(&dest, sent);
   }
   return 1;
 }