From 34b2d257cdc556430bd1bec5558d2b029ed16663 Mon Sep 17 00:00:00 2001
From: Daniele Lacamera <dan@danielinux.net>
Date: Tue, 23 Jul 2019 19:28:03 +0200
Subject: [PATCH] [RIOT-OS/GNRC] Renamed GNRC callback functions

---
 src/internal.c   | 4 ++--
 src/wolfio.c     | 6 ++++--
 wolfssl/wolfio.h | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/internal.c b/src/internal.c
index d4a30402c..87eff77b1 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -1707,8 +1707,8 @@ int InitSSL_Ctx(WOLFSSL_CTX* ctx, WOLFSSL_METHOD* method, void* heap)
     ctx->CBIORecv = Mynewt_Receive;
     ctx->CBIOSend = Mynewt_Send;
 #elif defined(WOLFSSL_GNRC)
-    ctx->CBIORecv = GNRC_Receive;
-    ctx->CBIOSend = GNRC_Send;
+    ctx->CBIORecv = GNRC_ReceiveFrom;
+    ctx->CBIOSend = GNRC_SendTo;
 #endif
 
 #ifdef HAVE_NTRU
diff --git a/src/wolfio.c b/src/wolfio.c
index 2fbb5d643..c53ac57ea 100644
--- a/src/wolfio.c
+++ b/src/wolfio.c
@@ -2241,11 +2241,13 @@ int uIPGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *_ctx)
  * return : bytes sent, or error
  */
 
-int GNRC_Send(WOLFSSL* ssl, char* buf, int sz, void* _ctx)
+int GNRC_SendTo(WOLFSSL* ssl, char* buf, int sz, void* _ctx)
 {
     sock_tls_t *ctx = (sock_tls_t *)_ctx;
     int ret = 0;
     (void)ssl;
+    if (!ctx)
+        return WOLFSSL_CBIO_ERR_GENERAL;
     ret = sock_udp_send(&ctx->conn.udp, (unsigned char *)buf, sz, &ctx->peer_addr);
     if (ret == 0)
         return WOLFSSL_CBIO_ERR_WANT_WRITE;
@@ -2255,7 +2257,7 @@ int GNRC_Send(WOLFSSL* ssl, char* buf, int sz, void* _ctx)
 /* The GNRC TCP/IP receive callback
  *  return : nb bytes read, or error
  */
-int GNRC_Receive(WOLFSSL *ssl, char *buf, int sz, void *_ctx)
+int GNRC_ReceiveFrom(WOLFSSL *ssl, char *buf, int sz, void *_ctx)
 {
     sock_udp_ep_t ep;
     int ret;
diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h
index 428e893a6..d1b97017a 100644
--- a/wolfssl/wolfio.h
+++ b/wolfssl/wolfio.h
@@ -516,9 +516,9 @@ WOLFSSL_API void wolfSSL_SetIOWriteFlags(WOLFSSL* ssl, int flags);
 
     typedef struct gnrc_wolfssl_ctx sock_tls_t;
 
-    WOLFSSL_LOCAL int GNRC_Receive(WOLFSSL* ssl, char* buf, int sz,
+    WOLFSSL_LOCAL int GNRC_ReceiveFrom(WOLFSSL* ssl, char* buf, int sz,
                                      void* ctx);
-    WOLFSSL_LOCAL int GNRC_Send(WOLFSSL* ssl, char* buf, int sz, void* ctx);
+    WOLFSSL_LOCAL int GNRC_SendTo(WOLFSSL* ssl, char* buf, int sz, void* ctx);
 
 #endif