3 files changed, 8 insertions, 9 deletions
diff --git a/hicn-light/src/hicn/io/hicn.c b/hicn-light/src/hicn/io/hicn.c
index a239dc781..26c641e51 100644
--- a/hicn-light/src/hicn/io/hicn.c
+++ b/hicn-light/src/hicn/io/hicn.c
@@ -426,7 +426,7 @@ listener_hicn_get_socket(const listener_t * listener, const address_t * local,
 {
     assert(listener);
     assert(listener_get_type(listener) == FACE_TYPE_HICN);
-    assert(pair);
+    // assert(pair);
 
     /* ... */
 
@@ -503,7 +503,7 @@ static
 int
 connection_hicn_send_packet(const connection_t * connection, const uint8_t * packet, size_t size)
 {
-    assert(ops);
+    // assert(ops);
     assert(packet);
 
     /* ... */
diff --git a/hicn-light/src/hicn/io/tcp.c b/hicn-light/src/hicn/io/tcp.c
index 03911e556..0ed9b4650 100644
--- a/hicn-light/src/hicn/io/tcp.c
+++ b/hicn-light/src/hicn/io/tcp.c
@@ -224,7 +224,7 @@ int
 connection_tcp_initialize(connection_t * connection)
 {
     assert(connection);
-    assert(connection->type = FACE_TYPE_TCP);
+    assert(connection->type == FACE_TYPE_TCP);
 
     connection_tcp_data_t * data = connection->data;
     assert(data);
@@ -328,7 +328,7 @@ connection_tcp_send(const connection_t * connection, //const address_t * address
         msgbuf_t * msgbuf, bool queue)
 {
     assert(connection);
-    assert(address);
+    // assert(address);
     /* msgbuf can be NULL */
 
     /* No need to flush */
@@ -463,8 +463,8 @@ static
 void
 connection_tcp_read_callback(connection_t * connection, int fd, void * user_data)
 {
-    assert(!!(what & PARCEventType_Read));
-    assert(connection_void);
+    // assert(!!(what & PARCEventType_Read));
+    assert(connection);
 
     connection_tcp_data_t * data = connection->data;
     assert(RECV_BUFLEN - data->woff > MTU);
diff --git a/hicn-light/src/hicn/io/udp.c b/hicn-light/src/hicn/io/udp.c
index 2baae1e5b..f0eaf8fd0 100644
--- a/hicn-light/src/hicn/io/udp.c
+++ b/hicn-light/src/hicn/io/udp.c
@@ -318,8 +318,7 @@ connection_udp_initialize(connection_t * connection)
 
     assert(connection);
     assert(connection->type == FACE_TYPE_UDP);
-    assert(interface_name);
-    assert(address_pair);
+    assert(connection->interface_name);
 
     connection_udp_data_t * data = connection->data;
     assert(data);
@@ -454,7 +453,7 @@ static
 int
 connection_udp_send_packet(const connection_t * connection, const uint8_t * packet, size_t size)
 {
-    assert(ops);
+    assert(connection);
     assert(packet);
 
     if(connection_is_local(connection))