From fb631f991ec3e7ae125ddf1c6f3f3967c05c2fd6 Mon Sep 17 00:00:00 2001 From: Jalal Mostafa Date: Thu, 11 Jul 2024 14:09:12 +0200 Subject: [PATCH 1/2] cnet-chnl: return EPROTONOSUPPORT if chnl type is unexpected Signed-off-by: Jalal Mostafa --- lib/cnet/chnl/cnet_chnl.c | 5 +++-- lib/cnet/tcp/cnet_tcp.c | 2 +- lib/usr/clib/graph/cne_graph_worker.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/cnet/chnl/cnet_chnl.c b/lib/cnet/chnl/cnet_chnl.c index 8d6c5a57..968167ee 100644 --- a/lib/cnet/chnl/cnet_chnl.c +++ b/lib/cnet/chnl/cnet_chnl.c @@ -249,7 +249,7 @@ initialize_chnl(struct chnl *ch, int typ) pcb->opt_flag |= UDP_CHKSUM_FLAG; ch->ch_proto->proto = IPPROTO_UDP; - } else { + } else if (typ == SOCK_STREAM) { rb->cb_size = rb->cb_hiwat = stk->tcp->rcv_size; sb->cb_size = sb->cb_hiwat = stk->tcp->snd_size; rb->cb_lowat = sb->cb_lowat = 1; @@ -258,7 +258,8 @@ initialize_chnl(struct chnl *ch, int typ) return __errno_set(ENOBUFS); ch->ch_proto->proto = IPPROTO_TCP; - } + } else + return __errno_set(EPROTONOSUPPORT); pcb->ch = ch; ch->ch_pcb = pcb; diff --git a/lib/cnet/tcp/cnet_tcp.c b/lib/cnet/tcp/cnet_tcp.c index 1ec2ec11..c88da7ae 100644 --- a/lib/cnet/tcp/cnet_tcp.c +++ b/lib/cnet/tcp/cnet_tcp.c @@ -3515,7 +3515,7 @@ cnet_tcp_input(struct pcb_entry *pcb, pktmbuf_t *mbuf) free_seg: free_seg(seg); - CNE_DEBUG("Leave\n\n"); + CNE_DEBUG("Leave\n"); return rc; } diff --git a/lib/usr/clib/graph/cne_graph_worker.h b/lib/usr/clib/graph/cne_graph_worker.h index 6f95f28b..e7bdbdd2 100644 --- a/lib/usr/clib/graph/cne_graph_worker.h +++ b/lib/usr/clib/graph/cne_graph_worker.h @@ -520,7 +520,7 @@ cne_node_next_stream_move(struct cne_graph *graph, struct cne_node *src, cne_edg { struct cne_node *dst = __cne_node_next_node_get(src, next); - CNE_DEBUG("Src %-16s', Dst '%-16s' next %d\n", src->name, dst->name, next); + CNE_DEBUG("Src '%-16s', Dst '%-16s' next %d\n", src->name, dst->name, next); /* Swap the pointers if dst doesn't have valid objs */ if (likely(dst->idx == 0)) { From d431e6113f9a44e3458915fae9221fb311bd85cf Mon Sep 17 00:00:00 2001 From: Jalal Mostafa Date: Thu, 11 Jul 2024 15:17:59 +0200 Subject: [PATCH 2/2] cnet-protosw: conform cnet_protosw_find prototype with channel prototype Signed-off-by: Jalal Mostafa --- lib/cnet/protosw/cnet_protosw.c | 2 +- lib/cnet/protosw/cnet_protosw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cnet/protosw/cnet_protosw.c b/lib/cnet/protosw/cnet_protosw.c index 10da9d0e..0a9f17bc 100644 --- a/lib/cnet/protosw/cnet_protosw.c +++ b/lib/cnet/protosw/cnet_protosw.c @@ -35,7 +35,7 @@ cnet_protosw_match(uint16_t domain, uint16_t type, uint16_t proto) } struct protosw_entry * -cnet_protosw_find(uint16_t domain, uint16_t type, uint16_t proto) +cnet_protosw_find(int domain, int type, int proto) { struct protosw_entry *p; diff --git a/lib/cnet/protosw/cnet_protosw.h b/lib/cnet/protosw/cnet_protosw.h index 6d0842dd..3217064e 100644 --- a/lib/cnet/protosw/cnet_protosw.h +++ b/lib/cnet/protosw/cnet_protosw.h @@ -96,7 +96,7 @@ CNDP_API struct protosw_entry *cnet_protosw_add(const char *name, uint16_t domai * @return * NULL on error or a pointer to a protocol switch entry. */ -CNDP_API struct protosw_entry *cnet_protosw_find(uint16_t domain, uint16_t type, uint16_t proto); +CNDP_API struct protosw_entry *cnet_protosw_find(int domain, int type, int proto); /** * @brief Dump out the list of protocol switch values.