[lwip-users] [lwip] trivial udp patch

[Jani Monoses]

If UDP is disabled then most of udp.c isn't compiled in but its functions are 
called in api_msg.c
resulting in link error.

--- api_msg.c   Thu Jun 20 22:05:44 2002
+++ api_msg.c   Fri Jun 21 18:14:14 2002
@@ -60,6 +60,7 @@
   return ERR_OK;
 }
 
/*-----------------------------------------------------------------------------------*/
+#if LWIP_UDP
 static void
 recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
         struct ip_addr *addr, u16_t port)
@@ -89,6 +90,7 @@
     sys_mbox_post(conn->recvmbox, buf);
   }
 }
+#endif
 
/*-----------------------------------------------------------------------------------*/
 static err_t
 poll_tcp(void *arg, struct tcp_pcb *pcb)
@@ -207,6 +209,7 @@
 {
   if(msg->conn->pcb.tcp != NULL) {
     switch(msg->conn->type) {
+#if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
     case NETCONN_UDPNOCHKSUM:
@@ -215,6 +218,7 @@
       msg->conn->pcb.udp->recv_arg = NULL;
       udp_remove(msg->conn->pcb.udp);
       break;
+#endif      
     case NETCONN_TCP:
       tcp_arg(msg->conn->pcb.tcp, NULL);
       tcp_sent(msg->conn->pcb.tcp, NULL);
@@ -242,6 +246,7 @@
 {
   if(msg->conn->pcb.tcp == NULL) {
     switch(msg->conn->type) {
+#if LWIP_UDP
     case NETCONN_UDPLITE:
       msg->conn->pcb.udp = udp_new();
       udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_UDPLITE);
@@ -256,6 +261,7 @@
       msg->conn->pcb.udp = udp_new();
       udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
       break;
+#endif      
     case NETCONN_TCP:
       msg->conn->pcb.tcp = tcp_new();
       setup_tcp(msg->conn);
@@ -263,6 +269,7 @@
     }
   }
   switch(msg->conn->type) {
+#if LWIP_UDP
   case NETCONN_UDPLITE:
     /* FALLTHROUGH */
   case NETCONN_UDPNOCHKSUM:
@@ -270,6 +277,7 @@
   case NETCONN_UDP:
     udp_bind(msg->conn->pcb.udp, msg->msg.bc.ipaddr, msg->msg.bc.port);
     break;
+#endif    
   case NETCONN_TCP:
     msg->conn->err = tcp_bind(msg->conn->pcb.tcp,
                              msg->msg.bc.ipaddr, msg->msg.bc.port);
@@ -304,6 +312,7 @@
 {
   if(msg->conn->pcb.tcp == NULL) {
     switch(msg->conn->type) {
+#if LWIP_UDP
     case NETCONN_UDPLITE:
       msg->conn->pcb.udp = udp_new();
       if(msg->conn->pcb.udp == NULL) {
@@ -333,6 +342,7 @@
       }
       udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
       break;
+#endif      
     case NETCONN_TCP:
       msg->conn->pcb.tcp = tcp_new();      
       if(msg->conn->pcb.tcp == NULL) {
@@ -344,6 +354,7 @@
     }
   }
   switch(msg->conn->type) {
+#if LWIP_UDP
   case NETCONN_UDPLITE:
     /* FALLTHROUGH */
   case NETCONN_UDPNOCHKSUM:
@@ -352,6 +363,7 @@
     udp_connect(msg->conn->pcb.udp, msg->msg.bc.ipaddr, msg->msg.bc.port);
     sys_mbox_post(msg->conn->mbox, NULL);
     break;
+#endif    
   case NETCONN_TCP:
     /*    tcp_arg(msg->conn->pcb.tcp, msg->conn);*/
     setup_tcp(msg->conn);
@@ -367,6 +379,7 @@
 {
   if(msg->conn->pcb.tcp != NULL) {
     switch(msg->conn->type) {
+#if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
     case NETCONN_UDPNOCHKSUM:
@@ -374,6 +387,7 @@
     case NETCONN_UDP:
       DEBUGF(API_MSG_DEBUG, ("api_msg: listen UDP: cannot listen for UDP.\n"));
       break;
+#endif      
     case NETCONN_TCP:
       msg->conn->pcb.tcp = tcp_listen(msg->conn->pcb.tcp);
       if(msg->conn->pcb.tcp == NULL) {
@@ -400,6 +414,7 @@
 {
   if(msg->conn->pcb.tcp != NULL) {
     switch(msg->conn->type) {
+#if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
     case NETCONN_UDPNOCHKSUM:
@@ -407,6 +422,7 @@
     case NETCONN_UDP:    
       DEBUGF(API_MSG_DEBUG, ("api_msg: accept UDP: cannot accept for UDP.\n"));
       break;
+#endif      
     case NETCONN_TCP:
       break;
     }
@@ -418,6 +434,7 @@
 {
   if(msg->conn->pcb.tcp != NULL) {
     switch(msg->conn->type) {
+#if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
     case NETCONN_UDPNOCHKSUM:
@@ -425,6 +442,7 @@
     case NETCONN_UDP:
       udp_send(msg->conn->pcb.udp, msg->msg.p);
       break;
+#endif      
     case NETCONN_TCP:
       break;
     }
@@ -449,6 +467,7 @@
   err_t err;
   if(msg->conn->pcb.tcp != NULL) {
     switch(msg->conn->type) {
+#if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
     case NETCONN_UDPNOCHKSUM:
@@ -456,6 +475,7 @@
     case NETCONN_UDP:
       msg->conn->err = ERR_VAL;
       break;
+#endif
     case NETCONN_TCP:      
       err = tcp_write(msg->conn->pcb.tcp, msg->msg.w.dataptr,
                       msg->msg.w.len, msg->msg.w.copy);
@@ -479,12 +499,14 @@
   err_t err;
   if(msg->conn->pcb.tcp != NULL) {
     switch(msg->conn->type) {
+#if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
     case NETCONN_UDPNOCHKSUM:
       /* FALLTHROUGH */
     case NETCONN_UDP:
       break;
+#endif      
     case NETCONN_TCP:
       if(msg->conn->pcb.tcp->state == LISTEN) {
        err = tcp_close(msg->conn->pcb.tcp);
[This message was sent through the lwip discussion list.]