From 4f208600aa366d99fcea96609146c101d09c2f13 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 30 May 2016 09:31:44 -0600 Subject: [PATCH] Replace confusing references to uIP with just 'the network' --- net/Kconfig | 2 +- net/arp/arp.h | 2 +- net/arp/arp_table.c | 2 +- net/devif/devif.h | 4 ++-- net/devif/devif_poll.c | 8 ++++---- net/pkt/Kconfig | 6 +++--- net/route/net_foreachroute.c | 4 ++-- net/socket/net_close.c | 14 +++++++------- net/socket/net_sendfile.c | 2 +- net/socket/recvfrom.c | 4 ++-- net/tcp/tcp_accept.c | 4 ++-- net/tcp/tcp_callback.c | 2 +- net/tcp/tcp_conn.c | 2 +- net/tcp/tcp_input.c | 2 +- net/tcp/tcp_send_unbuffered.c | 2 +- net/udp/udp.h | 2 +- net/udp/udp_conn.c | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/net/Kconfig b/net/Kconfig index 6d98fc77dc2..3f454f4288d 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -44,7 +44,7 @@ config NET_MULTIBUFFER bool "Use multiple device-side I/O buffers" default n ---help--- - Traditionally, the uIP stacl has used a single buffer for all + Traditionally, the uIP-based stack has used a single buffer for all incoming and outgoing traffic. If this configuration is selected, then the driver can manage multiple I/O buffers and can, for example, be filling one input buffer while sending another output diff --git a/net/arp/arp.h b/net/arp/arp.h index b32490b4111..ba62f7893b1 100644 --- a/net/arp/arp.h +++ b/net/arp/arp.h @@ -382,7 +382,7 @@ void arp_notify(in_addr_t ipaddr); * * Assumptions * Interrupts are disabled; Returned value will become unstable when - * interrupts are re-enabled or if any other uIP APIs are called. + * interrupts are re-enabled or if any other network APIs are called. * ****************************************************************************/ diff --git a/net/arp/arp_table.c b/net/arp/arp_table.c index bdb27ad79dd..928ed590193 100644 --- a/net/arp/arp_table.c +++ b/net/arp/arp_table.c @@ -260,7 +260,7 @@ void arp_hdr_update(FAR uint16_t *pipaddr, FAR uint8_t *ethaddr) * * Assumptions * Interrupts are disabled; Returned value will become unstable when - * interrupts are re-enabled or if any other uIP APIs are called. + * interrupts are re-enabled or if any other network APIs are called. * ****************************************************************************/ diff --git a/net/devif/devif.h b/net/devif/devif.h index 2251ffcad0e..bca09878968 100644 --- a/net/devif/devif.h +++ b/net/devif/devif.h @@ -426,8 +426,8 @@ uint16_t devif_dev_event(FAR struct net_driver_s *dev, void *pvconn, * processing can send data. * * The amount of data that actually is sent out after a call to this - * function is determined by the maximum amount of data TCP allows. uIP - * will automatically crop the data so that only the appropriate + * function is determined by the maximum amount of data TCP allows. The + * network will automatically crop the data so that only the appropriate * amount of data is sent. The mss field of the TCP connection structure * can be used to determine the amount of data that actually will be sent. * diff --git a/net/devif/devif_poll.c b/net/devif/devif_poll.c index 3ec68be4f39..928b779fb38 100644 --- a/net/devif/devif_poll.c +++ b/net/devif/devif_poll.c @@ -296,7 +296,7 @@ static inline int devif_poll_tcp_timer(FAR struct net_driver_s *dev, * Function: devif_poll * * Description: - * This function will traverse each active uIP connection structure and + * This function will traverse each active network connection structure and * will perform network polling operations. devif_poll() may be called * asynchronously with the network driver can accept another outgoing * packet. @@ -307,7 +307,7 @@ static inline int devif_poll_tcp_timer(FAR struct net_driver_s *dev, * should do only if it cannot accept further write data). * * When the callback function is called, there may be an outbound packet - * waiting for service in the uIP packet buffer, and if so the d_len field + * waiting for service in the device packet buffer, and if so the d_len field * is set to a value larger than zero. The device driver should then send * out the packet. * @@ -400,7 +400,7 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback) * Function: devif_timer * * Description: - * These function will traverse each active uIP connection structure and + * These function will traverse each active network connection structure and * perform network timer operations. The Ethernet driver MUST implement * logic to periodically call devif_timer(). * @@ -410,7 +410,7 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback) * should do only if it cannot accept further write data). * * When the callback function is called, there may be an outbound packet - * waiting for service in the uIP packet buffer, and if so the d_len field + * waiting for service in the device packet buffer, and if so the d_len field * is set to a value larger than zero. The device driver should then send * out the packet. * diff --git a/net/pkt/Kconfig b/net/pkt/Kconfig index 2fc26442dd3..ae9c7891f56 100644 --- a/net/pkt/Kconfig +++ b/net/pkt/Kconfig @@ -13,9 +13,9 @@ config NET_PKT Packet sockets allow receiving and transmitting frames without a transport protocol in between. Frames received are copied into - a packet socket tap before they enter uIP. Data written into a - packet socket will bypass uIP altogether and be placed in the - transmission buffer of the network interface driver. + a packet socket tap before they enter the network. Data written into + a packet socket will bypass the network altogether and be placed in + the transmission buffer of the network interface driver. if NET_PKT diff --git a/net/route/net_foreachroute.c b/net/route/net_foreachroute.c index 13c154f539e..1c5789dd649 100644 --- a/net/route/net_foreachroute.c +++ b/net/route/net_foreachroute.c @@ -91,7 +91,7 @@ int net_foreachroute(route_handler_t handler, FAR void *arg) ret = handler(route, arg); } - /* Unlock uIP */ + /* Unlock the network */ net_unlock(save); return ret; @@ -122,7 +122,7 @@ int net_foreachroute_ipv6(route_handler_ipv6_t handler, FAR void *arg) ret = handler(route, arg); } - /* Unlock uIP */ + /* Unlock the network */ net_unlock(save); return ret; diff --git a/net/socket/net_close.c b/net/socket/net_close.c index f439811b854..f03a9caeea4 100644 --- a/net/socket/net_close.c +++ b/net/socket/net_close.c @@ -136,10 +136,10 @@ static inline int close_timeout(FAR struct tcp_close_s *pstate) * Function: netclose_interrupt * * Description: - * Handle uIP callback events. + * Handle network callback events. * * Parameters: - * conn - uIP TCP connection structure + * conn - TCP connection structure * * Returned Value: * None @@ -320,7 +320,7 @@ static inline void netclose_txnotify(FAR struct socket *psock, * Break any current TCP connection * * Parameters: - * conn - uIP TCP connection structure + * conn - TCP connection structure * * Returned Value: * None @@ -428,7 +428,7 @@ static inline int netclose_disconnect(FAR struct socket *psock) /* Free the connection */ conn->crefs = 0; /* No more references on the connection */ - tcp_free(conn); /* Free uIP resources */ + tcp_free(conn); /* Free network resources */ /* Get the result of the close */ @@ -517,7 +517,7 @@ int psock_close(FAR struct socket *psock) goto errout; } - /* We perform the uIP close operation only if this is the last count on + /* We perform the close operation only if this is the last count on * the socket. (actually, I think the socket crefs only takes the values * 0 and 1 right now). * @@ -527,7 +527,7 @@ int psock_close(FAR struct socket *psock) if (psock->s_crefs <= 1 && psock->s_conn != NULL) { - /* Perform uIP side of the close depending on the protocol type */ + /* Perform local side of the close depending on the protocol type */ switch (psock->s_type) { @@ -649,7 +649,7 @@ int psock_close(FAR struct socket *psock) /* Yes... free the connection structure */ conn->crefs = 0; /* No more references on the connection */ - pkt_free(psock->s_conn); /* Free uIP resources */ + pkt_free(psock->s_conn); /* Free network resources */ } else { diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c index a8b7b9f1628..d5fde260231 100644 --- a/net/socket/net_sendfile.c +++ b/net/socket/net_sendfile.c @@ -402,7 +402,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon dev->d_sndlen = sndlen; - /* Set the sequence number for this packet. NOTE: uIP updates + /* Set the sequence number for this packet. NOTE: The network updates * sndseq on recept of ACK *before* this function is called. In that * case sndseq will point to the next unacknowledge byte (which might * have already been sent). We will overwrite the value of sndseq diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c index 01259753933..9bc234f5418 100644 --- a/net/socket/recvfrom.c +++ b/net/socket/recvfrom.c @@ -1692,8 +1692,8 @@ static ssize_t tcp_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, } } - /* In general, this uIP-based implementation will not support non-blocking - * socket operations... except in a few cases: Here for TCP receive with read-ahead + /* In general, this implementation will not support non-blocking socket + * operations... except in a few cases: Here for TCP receive with read-ahead * enabled. If this socket is configured as non-blocking then return EAGAIN * if no data was obtained from the read-ahead buffers. */ diff --git a/net/tcp/tcp_accept.c b/net/tcp/tcp_accept.c index a37db211db4..ced4f0d659f 100644 --- a/net/tcp/tcp_accept.c +++ b/net/tcp/tcp_accept.c @@ -250,8 +250,8 @@ int psock_tcp_accept(FAR struct socket *psock, FAR struct sockaddr *addr, accept_tcpsender(psock, state.acpt_newconn, addr, addrlen); } - /* In general, this uIP-based implementation will not support non-blocking - * socket operations... except in a few cases: Here for TCP accept with + /* In general, this implementation will not support non-blocking socket + * operations... except in a few cases: Here for TCP accept with * backlog enabled. If this socket is configured as non-blocking then * return EAGAIN if there is no pending connection in the backlog. */ diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index 73c6175fee5..ac430919230 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -147,7 +147,7 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn, uint16_t flags) { /* Preserve the TCP_ACKDATA, TCP_CLOSE, and TCP_ABORT in the response. - * These is needed by uIP to handle responses and buffer state. The + * These is needed by the network to handle responses and buffer state. The * TCP_NEWDATA indication will trigger the ACK response, but must be * explicitly set in the callback. */ diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index 6cc9950fc06..efc6527cc5a 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -73,7 +73,7 @@ * Private Data ****************************************************************************/ -/* The array containing all uIP TCP connections. */ +/* The array containing all TCP connections. */ static struct tcp_conn_s g_tcp_connections[CONFIG_NET_TCP_CONNS]; diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index 97bcb402fd7..19c207f6550 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -376,7 +376,7 @@ found: ackseq = tcp_getsequence(tcp->ackno); /* Check how many of the outstanding bytes have been acknowledged. For - * a most uIP send operation, this should always be true. However, + * most send operations, this should always be true. However, * the send() API sends data ahead when it can without waiting for * the ACK. In this case, the 'ackseq' could be less than then the * new sequence number. diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 6d5c608ba37..53365e3f685 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -518,7 +518,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev, if ((pstate->snd_sent - pstate->snd_acked + sndlen) < conn->winsize) { - /* Set the sequence number for this packet. NOTE: uIP updates + /* Set the sequence number for this packet. NOTE: The network updates * sndseq on receipt of ACK *before* this function is called. In that * case sndseq will point to the next unacknowledged byte (which might * have already been sent). We will overwrite the value of sndseq diff --git a/net/udp/udp.h b/net/udp/udp.h index 91447d25965..f8584bff0b9 100644 --- a/net/udp/udp.h +++ b/net/udp/udp.h @@ -74,7 +74,7 @@ * Public Type Definitions ****************************************************************************/ -/* Representation of a uIP UDP connection */ +/* Representation of a UDP connection */ struct devif_callback_s; /* Forward reference */ struct udp_hdr_s; /* Forward reference */ diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c index ddd599382e5..1f5ecd095c6 100644 --- a/net/udp/udp_conn.c +++ b/net/udp/udp_conn.c @@ -76,7 +76,7 @@ * Private Data ****************************************************************************/ -/* The array containing all uIP UDP connections. */ +/* The array containing all UDP connections. */ struct udp_conn_s g_udp_connections[CONFIG_NET_UDP_CONNS];