Return an error if we can't allocate the packet buffer during utcp_init().

[utcp] / utcp.c

diff --git a/utcp.c b/utcp.c
index f7c1859de2abe5ef05873bb1ef6565d449810e3d..5eca4d3897a82eec6bbc1bca6de33c324fb73daa 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -847,13 +847,7 @@ static void fast_retransmit(struct utcp_connection *c) {
        struct {
                struct hdr hdr;
                uint8_t data[];
-       } *pkt;
-
-       pkt = malloc(c->utcp->mtu);
-
-       if(!pkt) {
-               return;
-       }
+       } *pkt = c->utcp->pkt;
 
        pkt->hdr.src = c->src;
        pkt->hdr.dst = c->dst;
@@ -885,8 +879,6 @@ static void fast_retransmit(struct utcp_connection *c) {
        default:
                break;
        }
-
-       free(pkt);
 }
 
 static void retransmit(struct utcp_connection *c) {
@@ -898,6 +890,10 @@ static void retransmit(struct utcp_connection *c) {
 
        struct utcp *utcp = c->utcp;
 
+       if (utcp->retransmit) {
+               utcp->retransmit(c);
+       }
+
        struct {
                struct hdr hdr;
                uint8_t data[];
@@ -2173,6 +2169,13 @@ struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_
                return NULL;
        }
 
+       utcp_set_mtu(utcp, DEFAULT_MTU);
+
+       if(!utcp->pkt) {
+               free(utcp);
+               return NULL;
+       }
+
        if(!CLOCK_GRANULARITY) {
                struct timespec res;
                clock_getres(UTCP_CLOCK, &res);
@@ -2183,7 +2186,6 @@ struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_
        utcp->pre_accept = pre_accept;
        utcp->send = send;
        utcp->priv = priv;
-       utcp_set_mtu(utcp, DEFAULT_MTU);
        utcp->timeout = DEFAULT_USER_TIMEOUT; // sec
 
        return utcp;
@@ -2455,6 +2457,10 @@ void utcp_offline(struct utcp *utcp, bool offline) {
        }
 }
 
+void utcp_set_retransmit_cb(struct utcp *utcp, utcp_retransmit_t retransmit) {
+       utcp->retransmit = retransmit;
+}
+
 void utcp_set_clock_granularity(long granularity) {
        CLOCK_GRANULARITY = granularity;
 }