mirror of
https://github.com/apache/nuttx.git
synced 2026-06-07 09:18:00 +08:00
Replace all occurrences of vdbg with vinfo
This commit is contained in:
+2
-2
@@ -107,7 +107,7 @@ void arp_arpin(FAR struct net_driver_s *dev)
|
||||
switch (arp->ah_opcode)
|
||||
{
|
||||
case HTONS(ARP_REQUEST):
|
||||
nllvdbg("ARP request for IP %04lx\n", (long)ipaddr);
|
||||
nllinfo("ARP request for IP %04lx\n", (long)ipaddr);
|
||||
|
||||
/* ARP request. If it asked for our address, we send out a reply. */
|
||||
|
||||
@@ -139,7 +139,7 @@ void arp_arpin(FAR struct net_driver_s *dev)
|
||||
break;
|
||||
|
||||
case HTONS(ARP_REPLY):
|
||||
nllvdbg("ARP reply for IP %04lx\n", (long)ipaddr);
|
||||
nllinfo("ARP reply for IP %04lx\n", (long)ipaddr);
|
||||
|
||||
/* ARP reply. We insert or update the ARP table if it was meant
|
||||
* for us.
|
||||
|
||||
+1
-1
@@ -231,7 +231,7 @@ void arp_out(FAR struct net_driver_s *dev)
|
||||
tabptr = arp_find(ipaddr);
|
||||
if (!tabptr)
|
||||
{
|
||||
nllvdbg("ARP request for IP %08lx\n", (unsigned long)ipaddr);
|
||||
nllinfo("ARP request for IP %08lx\n", (unsigned long)ipaddr);
|
||||
|
||||
/* The destination address was not in our ARP table, so we
|
||||
* overwrite the IP packet with an ARP request.
|
||||
|
||||
+1
-1
@@ -102,7 +102,7 @@ static uint16_t arp_send_interrupt(FAR struct net_driver_s *dev,
|
||||
{
|
||||
FAR struct arp_send_s *state = (FAR struct arp_send_s *)priv;
|
||||
|
||||
nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent);
|
||||
nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent);
|
||||
|
||||
if (state)
|
||||
{
|
||||
|
||||
@@ -410,7 +410,7 @@ uint16_t devif_conn_event(FAR struct net_driver_s *dev, void *pvconn,
|
||||
* beginning of the list (which will be ignored on this pass)
|
||||
*/
|
||||
|
||||
nllvdbg("Call event=%p with flags=%04x\n", list->event, flags);
|
||||
nllinfo("Call event=%p with flags=%04x\n", list->event, flags);
|
||||
flags = list->event(dev, pvconn, list->priv, flags);
|
||||
}
|
||||
|
||||
@@ -475,7 +475,7 @@ uint16_t devif_dev_event(FAR struct net_driver_s *dev, void *pvconn,
|
||||
* beginning of the list (which will be ignored on this pass)
|
||||
*/
|
||||
|
||||
nllvdbg("Call event=%p with flags=%04x\n", cb->event, flags);
|
||||
nllinfo("Call event=%p with flags=%04x\n", cb->event, flags);
|
||||
flags = cb->event(dev, pvconn, cb->priv, flags);
|
||||
}
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@ void icmp_input(FAR struct net_driver_s *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
nllvdbg("Outgoing ICMP packet length: %d (%d)\n",
|
||||
nllinfo("Outgoing ICMP packet length: %d (%d)\n",
|
||||
dev->d_len, (picmp->len[0] << 8) | picmp->len[1]);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
|
||||
@@ -154,7 +154,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
|
||||
FAR uint8_t *ptr;
|
||||
int i;
|
||||
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
if (pstate)
|
||||
{
|
||||
@@ -177,7 +177,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
|
||||
{
|
||||
FAR struct icmp_iphdr_s *icmp = (FAR struct icmp_iphdr_s *)conn;
|
||||
|
||||
nllvdbg("ECHO reply: id=%d seqno=%d\n",
|
||||
nllinfo("ECHO reply: id=%d seqno=%d\n",
|
||||
ntohs(icmp->id), ntohs(icmp->seqno));
|
||||
|
||||
if (ntohs(icmp->id) == pstate->png_id)
|
||||
@@ -236,7 +236,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
|
||||
* of the ICMP header.
|
||||
*/
|
||||
|
||||
nllvdbg("Send ECHO request: seqno=%d\n", pstate->png_seqno);
|
||||
nllinfo("Send ECHO request: seqno=%d\n", pstate->png_seqno);
|
||||
|
||||
dev->d_sndlen = pstate->png_datlen + 4;
|
||||
icmp_send(dev, &pstate->png_addr);
|
||||
@@ -283,7 +283,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
|
||||
return flags;
|
||||
|
||||
end_wait:
|
||||
nllvdbg("Resuming\n");
|
||||
nllinfo("Resuming\n");
|
||||
|
||||
/* Do not allow any further callbacks */
|
||||
|
||||
@@ -397,7 +397,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
|
||||
* re-enabled when the task restarts.
|
||||
*/
|
||||
|
||||
nllvdbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
|
||||
nllinfo("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
|
||||
net_lockedwait(&state.png_sem);
|
||||
|
||||
icmp_callback_free(dev, state.png_cb);
|
||||
@@ -411,7 +411,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
|
||||
|
||||
if (!state.png_result)
|
||||
{
|
||||
nllvdbg("Return seqno=%d\n", state.png_seqno);
|
||||
nllinfo("Return seqno=%d\n", state.png_seqno);
|
||||
return (int)state.png_seqno;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -131,7 +131,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR in_addr_t *destaddr)
|
||||
picmp->icmpchksum = 0xffff;
|
||||
}
|
||||
|
||||
nllvdbg("Outgoing ICMP packet length: %d (%d)\n",
|
||||
nllinfo("Outgoing ICMP packet length: %d (%d)\n",
|
||||
dev->d_len, (picmp->len[0] << 8) | picmp->len[1]);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
|
||||
@@ -180,7 +180,7 @@ void icmpv6_advertise(FAR struct net_driver_s *dev,
|
||||
|
||||
IFF_SET_NOARP(dev->d_flags);
|
||||
|
||||
nllvdbg("Outgoing ICMPv6 Neighbor Advertise length: %d (%d)\n",
|
||||
nllinfo("Outgoing ICMPv6 Neighbor Advertise length: %d (%d)\n",
|
||||
dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
|
||||
@@ -119,7 +119,7 @@ static uint16_t icmpv6_router_interrupt(FAR struct net_driver_s *dev,
|
||||
{
|
||||
FAR struct icmpv6_router_s *state = (FAR struct icmpv6_router_s *)priv;
|
||||
|
||||
nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent);
|
||||
nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent);
|
||||
|
||||
if (state)
|
||||
{
|
||||
@@ -354,7 +354,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
|
||||
/* Sanity checks */
|
||||
|
||||
DEBUGASSERT(dev);
|
||||
nvdbg("Auto-configuring %s\n", dev->d_ifname);
|
||||
ninfo("Auto-configuring %s\n", dev->d_ifname);
|
||||
|
||||
#ifdef CONFIG_NET_MULTILINK
|
||||
/* Only Ethernet devices are supported for now */
|
||||
@@ -402,7 +402,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
|
||||
memcpy(&lladdr[5], dev->d_mac.ether_addr_octet,
|
||||
sizeof(struct ether_addr)); /* 48-bit Ethernet address */
|
||||
|
||||
nvdbg("lladdr=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
ninfo("lladdr=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
lladdr[0], lladdr[1], lladdr[2], lladdr[3],
|
||||
lladdr[4], lladdr[6], lladdr[6], lladdr[7]);
|
||||
|
||||
@@ -493,7 +493,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
|
||||
break;
|
||||
}
|
||||
|
||||
nvdbg("Timed out... retrying %d\n", retries + 1);
|
||||
ninfo("Timed out... retrying %d\n", retries + 1);
|
||||
}
|
||||
|
||||
/* Check for failures. Note: On successful return, the network will be
|
||||
|
||||
@@ -312,7 +312,7 @@ void icmpv6_input(FAR struct net_driver_s *dev)
|
||||
}
|
||||
}
|
||||
|
||||
nllvdbg("Outgoing ICMPv6 packet length: %d (%d)\n",
|
||||
nllinfo("Outgoing ICMPv6 packet length: %d (%d)\n",
|
||||
dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
|
||||
@@ -103,7 +103,7 @@ static uint16_t icmpv6_neighbor_interrupt(FAR struct net_driver_s *dev,
|
||||
{
|
||||
FAR struct icmpv6_neighbor_s *state = (FAR struct icmpv6_neighbor_s *)priv;
|
||||
|
||||
nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent);
|
||||
nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent);
|
||||
|
||||
if (state)
|
||||
{
|
||||
|
||||
@@ -164,7 +164,7 @@ static void icmpv6_echo_request(FAR struct net_driver_s *dev,
|
||||
uint16_t reqlen;
|
||||
int i;
|
||||
|
||||
nllvdbg("Send ECHO request: seqno=%d\n", pstate->png_seqno);
|
||||
nllinfo("Send ECHO request: seqno=%d\n", pstate->png_seqno);
|
||||
|
||||
/* Set up the IPv6 header (most is probably already in place) */
|
||||
|
||||
@@ -217,7 +217,7 @@ static void icmpv6_echo_request(FAR struct net_driver_s *dev,
|
||||
dev->d_sndlen = reqlen;
|
||||
dev->d_len = reqlen + IPv6_HDRLEN;
|
||||
|
||||
nllvdbg("Outgoing ICMPv6 Echo Request length: %d (%d)\n",
|
||||
nllinfo("Outgoing ICMPv6 Echo Request length: %d (%d)\n",
|
||||
dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
@@ -253,7 +253,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
|
||||
{
|
||||
FAR struct icmpv6_ping_s *pstate = (struct icmpv6_ping_s *)pvpriv;
|
||||
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
if (pstate)
|
||||
{
|
||||
@@ -276,7 +276,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
|
||||
{
|
||||
FAR struct icmpv6_echo_reply_s *reply = ICMPv6ECHOREPLY;
|
||||
|
||||
nllvdbg("ECHO reply: id=%d seqno=%d\n",
|
||||
nllinfo("ECHO reply: id=%d seqno=%d\n",
|
||||
ntohs(reply->id), ntohs(reply->seqno));
|
||||
|
||||
if (ntohs(reply->id) == pstate->png_id)
|
||||
@@ -357,7 +357,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
|
||||
return flags;
|
||||
|
||||
end_wait:
|
||||
nllvdbg("Resuming\n");
|
||||
nllinfo("Resuming\n");
|
||||
|
||||
/* Do not allow any further callbacks */
|
||||
|
||||
@@ -471,7 +471,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno,
|
||||
* re-enabled when the task restarts.
|
||||
*/
|
||||
|
||||
nllvdbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
|
||||
nllinfo("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
|
||||
net_lockedwait(&state.png_sem);
|
||||
|
||||
icmpv6_callback_free(dev, state.png_cb);
|
||||
@@ -485,7 +485,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno,
|
||||
|
||||
if (!state.png_result)
|
||||
{
|
||||
nllvdbg("Return seqno=%d\n", state.png_seqno);
|
||||
nllinfo("Return seqno=%d\n", state.png_seqno);
|
||||
return (int)state.png_seqno;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -242,7 +242,7 @@ void icmpv6_radvertise(FAR struct net_driver_s *dev)
|
||||
|
||||
IFF_SET_NOARP(dev->d_flags);
|
||||
|
||||
nllvdbg("Outgoing ICMPv6 Router Advertise length: %d (%d)\n",
|
||||
nllinfo("Outgoing ICMPv6 Router Advertise length: %d (%d)\n",
|
||||
dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
|
||||
@@ -106,7 +106,7 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev,
|
||||
|
||||
net_ipv6_pref2mask(preflen, dev->d_ipv6netmask);
|
||||
|
||||
nvdbg("preflen=%d netmask=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
ninfo("preflen=%d netmask=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
preflen, dev->d_ipv6netmask[0], dev->d_ipv6netmask[1],
|
||||
dev->d_ipv6netmask[2], dev->d_ipv6netmask[3], dev->d_ipv6netmask[4],
|
||||
dev->d_ipv6netmask[5], dev->d_ipv6netmask[6], dev->d_ipv6netmask[7]);
|
||||
@@ -119,10 +119,10 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev,
|
||||
(prefix[i] & dev->d_ipv6netmask[i]);
|
||||
}
|
||||
|
||||
nvdbg("prefix=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
ninfo("prefix=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
prefix[0], prefix[1], prefix[2], prefix[3],
|
||||
prefix[4], prefix[6], prefix[6], prefix[7]);
|
||||
nvdbg("IP address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
ninfo("IP address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
|
||||
dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[6],
|
||||
dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
|
||||
@@ -131,7 +131,7 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev,
|
||||
|
||||
net_ipv6addr_copy(dev->d_ipv6draddr, draddr);
|
||||
|
||||
nvdbg("DR address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
ninfo("DR address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
dev->d_ipv6draddr[0], dev->d_ipv6draddr[1], dev->d_ipv6draddr[2],
|
||||
dev->d_ipv6draddr[3], dev->d_ipv6draddr[4], dev->d_ipv6draddr[6],
|
||||
dev->d_ipv6draddr[6], dev->d_ipv6draddr[7]);
|
||||
@@ -212,7 +212,7 @@ int icmpv6_rwait_cancel(FAR struct icmpv6_rnotify_s *notify)
|
||||
irqstate_t flags;
|
||||
int ret = -ENOENT;
|
||||
|
||||
nvdbg("Cancelling...\n");
|
||||
ninfo("Cancelling...\n");
|
||||
|
||||
/* Remove our wait structure from the list (we may no longer be at the
|
||||
* head of the list).
|
||||
@@ -243,7 +243,7 @@ int icmpv6_rwait_cancel(FAR struct icmpv6_rnotify_s *notify)
|
||||
return ret;
|
||||
|
||||
#else
|
||||
nvdbg("Cancelling...\n");
|
||||
ninfo("Cancelling...\n");
|
||||
|
||||
/* If there is only one network device, then there can be only one entry
|
||||
* in the list of waiters.
|
||||
@@ -276,7 +276,7 @@ int icmpv6_rwait(FAR struct icmpv6_rnotify_s *notify,
|
||||
irqstate_t flags;
|
||||
int ret;
|
||||
|
||||
nvdbg("Waiting...\n");
|
||||
ninfo("Waiting...\n");
|
||||
|
||||
/* And wait for the Neighbor Advertisement (or a timeout). Interrupts will
|
||||
* be re-enabled while we wait.
|
||||
@@ -335,7 +335,7 @@ void icmpv6_rnotify(FAR struct net_driver_s *dev, const net_ipv6addr_t draddr,
|
||||
#ifdef CONFIG_NETDEV_MULTINIC
|
||||
FAR struct icmpv6_rnotify_s *curr;
|
||||
|
||||
nvdbg("Notified\n");
|
||||
ninfo("Notified\n");
|
||||
|
||||
/* Find an entry with the matching device name in the list of waiters */
|
||||
|
||||
@@ -364,7 +364,7 @@ void icmpv6_rnotify(FAR struct net_driver_s *dev, const net_ipv6addr_t draddr,
|
||||
#else
|
||||
FAR struct icmpv6_rnotify_s *waiter = g_icmpv6_rwaiters;
|
||||
|
||||
nvdbg("Notified\n");
|
||||
ninfo("Notified\n");
|
||||
|
||||
if (waiter)
|
||||
{
|
||||
|
||||
@@ -183,7 +183,7 @@ void icmpv6_rsolicit(FAR struct net_driver_s *dev)
|
||||
* outgoing packet.
|
||||
*/
|
||||
dev->d_len += netdev_ipv6_hdrlen(dev);
|
||||
nllvdbg("Outgoing ICMPv6 Router Solicitation length: %d (%d)\n",
|
||||
nllinfo("Outgoing ICMPv6 Router Solicitation length: %d (%d)\n",
|
||||
dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
|
||||
@@ -211,7 +211,7 @@ void icmpv6_solicit(FAR struct net_driver_s *dev,
|
||||
* outgoing packet.
|
||||
*/
|
||||
dev->d_len += netdev_ipv6_hdrlen(dev);
|
||||
nllvdbg("Outgoing ICMPv6 Neighbor Solicitation length: %d (%d)\n",
|
||||
nllinfo("Outgoing ICMPv6 Neighbor Solicitation length: %d (%d)\n",
|
||||
dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
|
||||
@@ -90,25 +90,25 @@
|
||||
# ifdef IGMP_GRPDEBUG
|
||||
# define grpdbg(format, ...) ndbg(format, ##__VA_ARGS__)
|
||||
# define grplldbg(format, ...) nlldbg(format, ##__VA_ARGS__)
|
||||
# define grpvdbg(format, ...) nvdbg(format, ##__VA_ARGS__)
|
||||
# define grpllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__)
|
||||
# define grpinfo(format, ...) ninfo(format, ##__VA_ARGS__)
|
||||
# define grpllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
|
||||
# else
|
||||
# define grpdbg(x...)
|
||||
# define grplldbg(x...)
|
||||
# define grpvdbg(x...)
|
||||
# define grpllvdbg(x...)
|
||||
# define grpinfo(x...)
|
||||
# define grpllinfo(x...)
|
||||
# endif
|
||||
#else
|
||||
# ifdef IGMP_GRPDEBUG
|
||||
# define grpdbg ndbg
|
||||
# define grplldbg nlldbg
|
||||
# define grpvdbg nvdbg
|
||||
# define grpllvdbg nllvdbg
|
||||
# define grpinfo ninfo
|
||||
# define grpllinfo nllinfo
|
||||
# else
|
||||
# define grpdbg (void)
|
||||
# define grplldbg (void)
|
||||
# define grpvdbg (void)
|
||||
# define grpllvdbg (void)
|
||||
# define grpinfo (void)
|
||||
# define grpllinfo (void)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
@@ -222,7 +222,7 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
|
||||
FAR struct igmp_group_s *group;
|
||||
net_lock_t flags;
|
||||
|
||||
nllvdbg("addr: %08x dev: %p\n", *addr, dev);
|
||||
nllinfo("addr: %08x dev: %p\n", *addr, dev);
|
||||
if (up_interrupt_context())
|
||||
{
|
||||
#if CONFIG_PREALLOC_IGMPGROUPS > 0
|
||||
|
||||
@@ -84,7 +84,7 @@ in_addr_t g_ipv4_allrouters;
|
||||
|
||||
void igmp_initialize(void)
|
||||
{
|
||||
nvdbg("IGMP initializing\n");
|
||||
ninfo("IGMP initializing\n");
|
||||
|
||||
net_ipaddr(g_ipv4_allrouters, 224, 0, 0, 2);
|
||||
net_ipaddr(g_ipv4_allsystems, 224, 0, 0, 1);
|
||||
@@ -105,7 +105,7 @@ void igmp_initialize(void)
|
||||
|
||||
void igmp_devinit(struct net_driver_s *dev)
|
||||
{
|
||||
nvdbg("IGMP initializing dev %p\n", dev);
|
||||
ninfo("IGMP initializing dev %p\n", dev);
|
||||
DEBUGASSERT(dev->grplist.head == NULL);
|
||||
|
||||
/* Add the all systems address to the group */
|
||||
|
||||
@@ -117,7 +117,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
in_addr_t grpaddr;
|
||||
unsigned int ticks;
|
||||
|
||||
nllvdbg("IGMP message: %04x%04x\n", IGMPBUF->destipaddr[1], IGMPBUF->destipaddr[0]);
|
||||
nllinfo("IGMP message: %04x%04x\n", IGMPBUF->destipaddr[1], IGMPBUF->destipaddr[0]);
|
||||
|
||||
/* Verify the message length */
|
||||
|
||||
@@ -186,7 +186,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
|
||||
/* This is the general query */
|
||||
|
||||
nllvdbg("General multicast query\n");
|
||||
nllinfo("General multicast query\n");
|
||||
if (IGMPBUF->maxresp == 0)
|
||||
{
|
||||
IGMP_STATINCR(g_netstats.igmp.v1_received);
|
||||
@@ -216,7 +216,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
}
|
||||
else /* if (IGMPBUF->grpaddr != 0) */
|
||||
{
|
||||
nllvdbg("Group-specific multicast queury\n");
|
||||
nllinfo("Group-specific multicast queury\n");
|
||||
|
||||
/* We first need to re-lookup the group since we used dest last time.
|
||||
* Use the incoming IPaddress!
|
||||
@@ -238,7 +238,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
|
||||
else if (group->grpaddr != 0)
|
||||
{
|
||||
nllvdbg("Unicast query\n");
|
||||
nllinfo("Unicast query\n");
|
||||
IGMP_STATINCR(g_netstats.igmp.ucast_query);
|
||||
|
||||
nlldbg("Query to a specific group with the group address as destination\n");
|
||||
@@ -254,7 +254,7 @@ void igmp_input(struct net_driver_s *dev)
|
||||
|
||||
case IGMPv2_MEMBERSHIP_REPORT:
|
||||
{
|
||||
nllvdbg("Membership report\n");
|
||||
nllinfo("Membership report\n");
|
||||
|
||||
IGMP_STATINCR(g_netstats.igmp.report_received);
|
||||
if (!IS_IDLEMEMBER(group->flags))
|
||||
|
||||
@@ -129,7 +129,7 @@ int igmp_joingroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
|
||||
{
|
||||
/* No... allocate a new entry */
|
||||
|
||||
nvdbg("Join to new group: %08x\n", grpaddr->s_addr);
|
||||
ninfo("Join to new group: %08x\n", grpaddr->s_addr);
|
||||
group = igmp_grpalloc(dev, &grpaddr->s_addr);
|
||||
IGMP_STATINCR(g_netstats.igmp.joins);
|
||||
|
||||
|
||||
@@ -172,7 +172,7 @@ int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
|
||||
|
||||
/* Return ENOENT if the address is not a member of the group */
|
||||
|
||||
nvdbg("Return -ENOENT\n");
|
||||
ninfo("Return -ENOENT\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ static void igmp_mcastmac(in_addr_t *ip, FAR uint8_t *mac)
|
||||
mac[4] = ip4_addr3(*ip);
|
||||
mac[5] = ip4_addr4(*ip);
|
||||
|
||||
nvdbg("IP: %08x -> MAC: %02x%02x%02x%02x%02x%02x\n",
|
||||
ninfo("IP: %08x -> MAC: %02x%02x%02x%02x%02x%02x\n",
|
||||
*ip, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip)
|
||||
{
|
||||
uint8_t mcastmac[6];
|
||||
|
||||
nvdbg("Adding: IP %08x\n", *ip);
|
||||
ninfo("Adding: IP %08x\n", *ip);
|
||||
if (dev->d_addmac)
|
||||
{
|
||||
igmp_mcastmac(ip, mcastmac);
|
||||
@@ -119,7 +119,7 @@ void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip)
|
||||
{
|
||||
uint8_t mcastmac[6];
|
||||
|
||||
nvdbg("Removing: IP %08x\n", *ip);
|
||||
ninfo("Removing: IP %08x\n", *ip);
|
||||
if (dev->d_rmmac)
|
||||
{
|
||||
igmp_mcastmac(ip, mcastmac);
|
||||
|
||||
@@ -87,7 +87,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev,
|
||||
if (group->msgid == IGMPv2_MEMBERSHIP_REPORT)
|
||||
{
|
||||
dest = &group->grpaddr;
|
||||
nllvdbg("Send IGMPv2_MEMBERSHIP_REPORT, dest=%08x flags=%02x\n",
|
||||
nllinfo("Send IGMPv2_MEMBERSHIP_REPORT, dest=%08x flags=%02x\n",
|
||||
*dest, group->flags);
|
||||
IGMP_STATINCR(g_netstats.igmp.report_sched);
|
||||
SET_LASTREPORT(group->flags); /* Remember we were the last to report */
|
||||
@@ -96,7 +96,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev,
|
||||
{
|
||||
DEBUGASSERT(group->msgid == IGMP_LEAVE_GROUP);
|
||||
dest = &g_ipv4_allrouters;
|
||||
nllvdbg("Send IGMP_LEAVE_GROUP, dest=%08x flags=%02x\n",
|
||||
nllinfo("Send IGMP_LEAVE_GROUP, dest=%08x flags=%02x\n",
|
||||
*dest, group->flags);
|
||||
IGMP_STATINCR(g_netstats.igmp.leave_sched);
|
||||
}
|
||||
@@ -114,7 +114,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev,
|
||||
|
||||
if (IS_WAITMSG(group->flags))
|
||||
{
|
||||
nllvdbg("Awakening waiter\n");
|
||||
nllinfo("Awakening waiter\n");
|
||||
sem_post(&group->sem);
|
||||
}
|
||||
}
|
||||
@@ -143,7 +143,7 @@ void igmp_poll(FAR struct net_driver_s *dev)
|
||||
{
|
||||
FAR struct igmp_group_s *group;
|
||||
|
||||
nllvdbg("Entry\n");
|
||||
nllinfo("Entry\n");
|
||||
|
||||
/* Setup the poll operation */
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen)
|
||||
void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
|
||||
FAR in_addr_t *destipaddr)
|
||||
{
|
||||
nllvdbg("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr);
|
||||
nllinfo("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr);
|
||||
|
||||
/* The total length to send is the size of the IP and IGMP headers and 4
|
||||
* bytes for the ROUTER ALERT (and, eventually, the Ethernet header)
|
||||
@@ -169,7 +169,7 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
|
||||
IGMP_STATINCR(g_netstats.igmp.poll_send);
|
||||
IGMP_STATINCR(g_netstats.ipv4.sent);
|
||||
|
||||
nllvdbg("Outgoing IGMP packet length: %d (%d)\n",
|
||||
nllinfo("Outgoing IGMP packet length: %d (%d)\n",
|
||||
dev->d_len, (IGMPBUF->len[0] << 8) | IGMPBUF->len[1]);
|
||||
igmp_dumppkt(RA, IPIGMP_HDRLEN + RASIZE);
|
||||
}
|
||||
|
||||
@@ -75,25 +75,25 @@
|
||||
# ifdef IGMP_GTMRDEBUG
|
||||
# define gtmrdbg(format, ...) ndbg(format, ##__VA_ARGS__)
|
||||
# define gtmrlldbg(format, ...) nlldbg(format, ##__VA_ARGS__)
|
||||
# define gtmrvdbg(format, ...) nvdbg(format, ##__VA_ARGS__)
|
||||
# define gtmrllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__)
|
||||
# define gtmrinfo(format, ...) ninfo(format, ##__VA_ARGS__)
|
||||
# define gtmrllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
|
||||
# else
|
||||
# define gtmrdbg(x...)
|
||||
# define gtmrlldbg(x...)
|
||||
# define gtmrvdbg(x...)
|
||||
# define gtmrllvdbg(x...)
|
||||
# define gtmrinfo(x...)
|
||||
# define gtmrllinfo(x...)
|
||||
# endif
|
||||
#else
|
||||
# ifdef IGMP_GTMRDEBUG
|
||||
# define gtmrdbg ndbg
|
||||
# define gtmrlldbg nlldbg
|
||||
# define gtmrvdbg nvdbg
|
||||
# define gtmrllvdbg nllvdbg
|
||||
# define gtmrinfo ninfo
|
||||
# define gtmrllinfo nllinfo
|
||||
# else
|
||||
# define gtmrdbg (void)
|
||||
# define gtmrlldbg (void)
|
||||
# define gtmrvdbg (void)
|
||||
# define gtmrllvdbg (void)
|
||||
# define gtmrinfo (void)
|
||||
# define gtmrllinfo (void)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
@@ -119,7 +119,7 @@ static void igmp_timeout(int argc, uint32_t arg, ...)
|
||||
|
||||
/* If the state is DELAYING_MEMBER then we send a report for this group */
|
||||
|
||||
nllvdbg("Timeout!\n");
|
||||
nllinfo("Timeout!\n");
|
||||
group = (FAR struct igmp_group_s *)arg;
|
||||
DEBUGASSERT(argc == 1 && group);
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
|
||||
unsigned int avail;
|
||||
unsigned int total = len;
|
||||
|
||||
nllvdbg("iob=%p len=%u offset=%u\n", iob, len, offset);
|
||||
nllinfo("iob=%p len=%u offset=%u\n", iob, len, offset);
|
||||
DEBUGASSERT(iob && src);
|
||||
|
||||
/* The offset must applied to data that is already in the I/O buffer chain */
|
||||
@@ -130,7 +130,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
|
||||
dest = &iob->io_data[iob->io_offset + offset];
|
||||
avail = iob->io_len - offset;
|
||||
|
||||
nllvdbg("iob=%p avail=%u len=%u next=%p\n", iob, avail, len, next);
|
||||
nllinfo("iob=%p avail=%u len=%u next=%p\n", iob, avail, len, next);
|
||||
|
||||
/* Will the rest of the copy fit into this buffer, overwriting
|
||||
* existing data.
|
||||
@@ -187,7 +187,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
|
||||
/* Copy from the user buffer to the I/O buffer. */
|
||||
|
||||
memcpy(dest, src, ncopy);
|
||||
nllvdbg("iob=%p Copy %u bytes new len=%u\n",
|
||||
nllinfo("iob=%p Copy %u bytes new len=%u\n",
|
||||
iob, ncopy, iob->io_len);
|
||||
|
||||
/* Adjust the total length of the copy and the destination address in
|
||||
@@ -227,7 +227,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
|
||||
/* Add the new, empty I/O buffer to the end of the buffer chain. */
|
||||
|
||||
iob->io_flink = next;
|
||||
nllvdbg("iob=%p added to the chain\n", iob);
|
||||
nllinfo("iob=%p added to the chain\n", iob);
|
||||
}
|
||||
|
||||
iob = next;
|
||||
|
||||
+2
-2
@@ -74,7 +74,7 @@ FAR struct iob_s *iob_free(FAR struct iob_s *iob)
|
||||
FAR struct iob_s *next = iob->io_flink;
|
||||
irqstate_t flags;
|
||||
|
||||
nllvdbg("iob=%p io_pktlen=%u io_len=%u next=%p\n",
|
||||
nllinfo("iob=%p io_pktlen=%u io_len=%u next=%p\n",
|
||||
iob, iob->io_pktlen, iob->io_len, next);
|
||||
|
||||
/* Copy the data that only exists in the head of a I/O buffer chain into
|
||||
@@ -104,7 +104,7 @@ FAR struct iob_s *iob_free(FAR struct iob_s *iob)
|
||||
DEBUGASSERT(next->io_len == 0 && next->io_flink == NULL);
|
||||
}
|
||||
|
||||
nllvdbg("next=%p io_pktlen=%u io_len=%u\n",
|
||||
nllinfo("next=%p io_pktlen=%u io_len=%u\n",
|
||||
next, next->io_pktlen, next->io_len);
|
||||
}
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen)
|
||||
{
|
||||
uint16_t pktlen;
|
||||
|
||||
nllvdbg("iob=%p trimlen=%d\n", iob, trimlen);
|
||||
nllinfo("iob=%p trimlen=%d\n", iob, trimlen);
|
||||
|
||||
if (iob && trimlen > 0)
|
||||
{
|
||||
@@ -89,7 +89,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen)
|
||||
{
|
||||
/* Do we trim this entire I/O buffer away? */
|
||||
|
||||
nllvdbg("iob=%p io_len=%d pktlen=%d trimlen=%d\n",
|
||||
nllinfo("iob=%p io_len=%d pktlen=%d trimlen=%d\n",
|
||||
iob, iob->io_len, pktlen, trimlen);
|
||||
|
||||
if (iob->io_len <= trimlen)
|
||||
@@ -120,7 +120,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen)
|
||||
|
||||
/* Free this entry and set the next I/O buffer as the head */
|
||||
|
||||
nllvdbg("iob=%p: Freeing\n", iob);
|
||||
nllinfo("iob=%p: Freeing\n", iob);
|
||||
(void)iob_free(iob);
|
||||
iob = next;
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ FAR struct iob_s *iob_trimtail(FAR struct iob_s *iob, unsigned int trimlen)
|
||||
* I/O buffer away?
|
||||
*/
|
||||
|
||||
nllvdbg("iob=%p len=%d vs %d\n", last, last->io_len, len);
|
||||
nllinfo("iob=%p len=%d vs %d\n", last, last->io_len, len);
|
||||
if (last->io_len <= len)
|
||||
{
|
||||
/* Yes.. Consume the entire buffer */
|
||||
|
||||
@@ -98,7 +98,7 @@ int local_fifo_read(int fd, FAR uint8_t *buf, size_t *len)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
nvdbg("Ignoring signal\n");
|
||||
ninfo("Ignoring signal\n");
|
||||
}
|
||||
else if (nread == 0)
|
||||
{
|
||||
|
||||
@@ -104,7 +104,7 @@ static int local_fifo_write(int fd, FAR const uint8_t *buf, size_t len)
|
||||
return -errcode;
|
||||
}
|
||||
|
||||
nvdbg("Ignoring signal\n");
|
||||
ninfo("Ignoring signal\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -76,11 +76,11 @@ void neighbor_add(FAR net_ipv6addr_t ipaddr, FAR struct neighbor_addr_s *addr)
|
||||
int oldest_ndx;
|
||||
int i;
|
||||
|
||||
nllvdbg("Add neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
nllinfo("Add neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
ntohs(ipaddr[0]), ntohs(ipaddr[1]), ntohs(ipaddr[2]),
|
||||
ntohs(ipaddr[3]), ntohs(ipaddr[4]), ntohs(ipaddr[5]),
|
||||
ntohs(ipaddr[6]), ntohs(ipaddr[7]));
|
||||
nllvdbg(" at: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
nllinfo(" at: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
addr->na_addr.ether_addr_octet[0],
|
||||
addr->na_addr.ether_addr_octet[1],
|
||||
addr->na_addr.ether_addr_octet[2],
|
||||
|
||||
@@ -72,7 +72,7 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr)
|
||||
{
|
||||
int i;
|
||||
|
||||
nllvdbg("Find neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
nllinfo("Find neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
|
||||
ntohs(ipaddr[0]), ntohs(ipaddr[1]), ntohs(ipaddr[2]),
|
||||
ntohs(ipaddr[3]), ntohs(ipaddr[4]), ntohs(ipaddr[5]),
|
||||
ntohs(ipaddr[6]), ntohs(ipaddr[7]));
|
||||
@@ -83,7 +83,7 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr)
|
||||
|
||||
if (net_ipv6addr_cmp(neighbor->ne_ipaddr, ipaddr))
|
||||
{
|
||||
nllvdbg(" at: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
nllinfo(" at: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
neighbor->ne_addr.na_addr.ether_addr_octet[0],
|
||||
neighbor->ne_addr.na_addr.ether_addr_octet[1],
|
||||
neighbor->ne_addr.na_addr.ether_addr_octet[2],
|
||||
@@ -95,6 +95,6 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr)
|
||||
}
|
||||
}
|
||||
|
||||
nllvdbg(" Not found\n");
|
||||
nllinfo(" Not found\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ FAR const struct neighbor_addr_s *neighbor_lookup(const net_ipv6addr_t ipaddr)
|
||||
neighbor = neighbor_findentry(ipaddr);
|
||||
if (neighbor != NULL)
|
||||
{
|
||||
nllvdbg("Lookup neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
nllinfo("Lookup neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
neighbor->ne_addr.na_addr.ether_addr_octet[0],
|
||||
neighbor->ne_addr.na_addr.ether_addr_octet[1],
|
||||
neighbor->ne_addr.na_addr.ether_addr_octet[2],
|
||||
|
||||
@@ -227,7 +227,7 @@ void neighbor_out(FAR struct net_driver_s *dev)
|
||||
naddr = neighbor_lookup(ipaddr);
|
||||
if (!naddr)
|
||||
{
|
||||
nllvdbg("IPv6 Neighbor solicitation for IPv6\n");
|
||||
nllinfo("IPv6 Neighbor solicitation for IPv6\n");
|
||||
|
||||
/* The destination address was not in our Neighbor Table, so we
|
||||
* overwrite the IPv6 packet with an ICMDv6 Neighbor Solicitation
|
||||
@@ -253,6 +253,6 @@ void neighbor_out(FAR struct net_driver_s *dev)
|
||||
*/
|
||||
|
||||
dev->d_len += netdev_ipv6_hdrlen(dev);
|
||||
nllvdbg("Outgoing IPv6 Packet length: %d (%d)\n",
|
||||
nllinfo("Outgoing IPv6 Packet length: %d (%d)\n",
|
||||
dev->d_len, (ip->len[0] << 8) | ip->len[1]);
|
||||
}
|
||||
|
||||
@@ -363,7 +363,7 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd,
|
||||
FAR struct net_driver_s *dev;
|
||||
int ret = -EINVAL;
|
||||
|
||||
nvdbg("cmd: %d\n", cmd);
|
||||
ninfo("cmd: %d\n", cmd);
|
||||
|
||||
/* Execute the command */
|
||||
|
||||
@@ -769,7 +769,7 @@ static int netdev_imsfioctl(FAR struct socket *psock, int cmd,
|
||||
FAR struct net_driver_s *dev;
|
||||
int ret = -EINVAL;
|
||||
|
||||
nvdbg("cmd: %d\n", cmd);
|
||||
ninfo("cmd: %d\n", cmd);
|
||||
|
||||
/* Execute the command */
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
uint16_t pkt_callback(FAR struct net_driver_s *dev,
|
||||
FAR struct pkt_conn_s *conn, uint16_t flags)
|
||||
{
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
/* Some sanity checking */
|
||||
|
||||
|
||||
+1
-1
@@ -93,7 +93,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
|
||||
{
|
||||
FAR struct send_s *pstate = (FAR struct send_s *)pvpriv;
|
||||
|
||||
nllvdbg("flags: %04x sent: %d\n", flags, pstate->snd_sent);
|
||||
nllinfo("flags: %04x sent: %d\n", flags, pstate->snd_sent);
|
||||
|
||||
if (pstate)
|
||||
{
|
||||
|
||||
@@ -126,7 +126,7 @@ static int netprocfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
FAR struct netprocfs_file_s *priv;
|
||||
FAR struct net_driver_s *dev;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* PROCFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -233,7 +233,7 @@ static ssize_t netprocfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
FAR struct netprocfs_file_s *priv;
|
||||
ssize_t nreturned;
|
||||
|
||||
fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
|
||||
finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -282,7 +282,7 @@ static int netprocfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct netprocfs_file_s *oldpriv;
|
||||
FAR struct netprocfs_file_s *newpriv;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
@@ -322,7 +322,7 @@ static int netprocfs_opendir(FAR const char *relpath,
|
||||
FAR struct netprocfs_level1_s *level1;
|
||||
int ndevs;
|
||||
|
||||
fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
|
||||
DEBUGASSERT(relpath && dir && !dir->u.procfs);
|
||||
|
||||
/* "net" is the only value of relpath that is a directory */
|
||||
@@ -420,7 +420,7 @@ static int netprocfs_readdir(FAR struct fs_dirent_s *dir)
|
||||
* error -ENOENT.
|
||||
*/
|
||||
|
||||
fvdbg("Entry %d: End of directory\n", index);
|
||||
finfo("Entry %d: End of directory\n", index);
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
@@ -575,7 +575,7 @@ ssize_t netprocfs_read_linegen(FAR struct netprocfs_file_s *priv,
|
||||
size_t xfrsize;
|
||||
ssize_t nreturned;
|
||||
|
||||
fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
|
||||
finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
|
||||
|
||||
/* Is there line data already buffered? */
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev,
|
||||
{
|
||||
struct tcp_connect_s *pstate = (struct tcp_connect_s *)pvpriv;
|
||||
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
/* 'priv' might be null in some race conditions (?) */
|
||||
|
||||
@@ -261,7 +261,7 @@ static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev,
|
||||
return flags & ~TCP_NEWDATA;
|
||||
}
|
||||
|
||||
nllvdbg("Resuming: %d\n", pstate->tc_result);
|
||||
nllinfo("Resuming: %d\n", pstate->tc_result);
|
||||
|
||||
/* Stop further callbacks */
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ int net_checksd(int sd, int oflags)
|
||||
|
||||
if (!psock || psock->s_crefs <= 0)
|
||||
{
|
||||
nvdbg("No valid socket for sd: %d\n", sd);
|
||||
ninfo("No valid socket for sd: %d\n", sd);
|
||||
return -EBADF;
|
||||
}
|
||||
|
||||
|
||||
@@ -161,7 +161,7 @@ static uint16_t netclose_interrupt(FAR struct net_driver_s *dev,
|
||||
|
||||
DEBUGASSERT(conn != NULL);
|
||||
|
||||
nllvdbg("conn: %p flags: %04x\n", conn, flags);
|
||||
nllinfo("conn: %p flags: %04x\n", conn, flags);
|
||||
|
||||
/* TCP_DISCONN_EVENTS:
|
||||
* TCP_CLOSE: The remote host has closed the connection
|
||||
@@ -250,7 +250,7 @@ end_wait:
|
||||
pstate->cl_cb->event = NULL;
|
||||
sem_post(&pstate->cl_sem);
|
||||
|
||||
nllvdbg("Resuming\n");
|
||||
nllinfo("Resuming\n");
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ static uint16_t connection_event(FAR struct net_driver_s *dev,
|
||||
|
||||
if (psock)
|
||||
{
|
||||
nllvdbg("flags: %04x s_flags: %02x\n", flags, psock->s_flags);
|
||||
nllinfo("flags: %04x s_flags: %02x\n", flags, psock->s_flags);
|
||||
|
||||
/* TCP_DISCONN_EVENTS: TCP_CLOSE, TCP_ABORT, TCP_TIMEDOUT, or
|
||||
* NETDEV_DOWN. All loss-of-connection events.
|
||||
|
||||
@@ -156,7 +156,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
|
||||
{
|
||||
FAR struct sendfile_s *pstate = (FAR struct sendfile_s *)pvpriv;
|
||||
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
if ((flags & TCP_ACKDATA) != 0)
|
||||
{
|
||||
@@ -197,7 +197,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
|
||||
*/
|
||||
|
||||
pstate->snd_acked = tcp_getsequence(tcp->ackno) - pstate->snd_isn;
|
||||
nllvdbg("ACK: acked=%d sent=%d flen=%d\n",
|
||||
nllinfo("ACK: acked=%d sent=%d flen=%d\n",
|
||||
pstate->snd_acked, pstate->snd_sent, pstate->snd_flen);
|
||||
|
||||
dev->d_sndlen = 0;
|
||||
@@ -336,7 +336,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
|
||||
}
|
||||
#endif
|
||||
|
||||
nllvdbg("flags: %04x acked: %d sent: %d\n",
|
||||
nllinfo("flags: %04x acked: %d sent: %d\n",
|
||||
flags, pstate->snd_acked, pstate->snd_sent);
|
||||
|
||||
/* Check for a loss of connection */
|
||||
@@ -410,7 +410,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
|
||||
*/
|
||||
|
||||
seqno = pstate->snd_sent + pstate->snd_isn;
|
||||
nllvdbg("SEND: sndseq %08x->%08x len: %d\n", conn->sndseq, seqno, ret);
|
||||
nllinfo("SEND: sndseq %08x->%08x len: %d\n", conn->sndseq, seqno, ret);
|
||||
|
||||
tcp_setsequence(conn->sndseq, seqno);
|
||||
|
||||
@@ -424,7 +424,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
|
||||
/* Update the amount of data sent (but not necessarily ACKed) */
|
||||
|
||||
pstate->snd_sent += sndlen;
|
||||
nllvdbg("pid: %d SEND: acked=%d sent=%d flen=%d\n", getpid(),
|
||||
nllinfo("pid: %d SEND: acked=%d sent=%d flen=%d\n", getpid(),
|
||||
pstate->snd_acked, pstate->snd_sent, pstate->snd_flen);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
|
||||
int err = 0;
|
||||
int ret = 0;
|
||||
|
||||
nvdbg("sockfd=%d cmd=%d\n", sockfd, cmd);
|
||||
ninfo("sockfd=%d cmd=%d\n", sockfd, cmd);
|
||||
|
||||
/* Verify that the sockfd corresponds to valid, allocated socket */
|
||||
|
||||
|
||||
+13
-13
@@ -181,7 +181,7 @@ static size_t recvfrom_newdata(FAR struct net_driver_s *dev,
|
||||
/* Copy the new appdata into the user buffer */
|
||||
|
||||
memcpy(pstate->rf_buffer, dev->d_appdata, recvlen);
|
||||
nllvdbg("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len);
|
||||
nllinfo("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len);
|
||||
|
||||
/* Update the accumulated size of the data read */
|
||||
|
||||
@@ -227,7 +227,7 @@ static void recvfrom_newpktdata(FAR struct net_driver_s *dev,
|
||||
/* Copy the new packet data into the user buffer */
|
||||
|
||||
memcpy(pstate->rf_buffer, dev->d_buf, recvlen);
|
||||
nllvdbg("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len);
|
||||
nllinfo("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len);
|
||||
|
||||
/* Update the accumulated size of the data read */
|
||||
|
||||
@@ -378,7 +378,7 @@ static inline void recvfrom_tcpreadahead(struct recvfrom_s *pstate)
|
||||
*/
|
||||
|
||||
recvlen = iob_copyout(pstate->rf_buffer, iob, pstate->rf_buflen, 0);
|
||||
nllvdbg("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen);
|
||||
nllinfo("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen);
|
||||
|
||||
/* Update the accumulated size of the data read */
|
||||
|
||||
@@ -478,7 +478,7 @@ static inline void recvfrom_udpreadahead(struct recvfrom_s *pstate)
|
||||
recvlen = iob_copyout(pstate->rf_buffer, iob, pstate->rf_buflen,
|
||||
src_addr_size + sizeof(uint8_t));
|
||||
|
||||
nllvdbg("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen);
|
||||
nllinfo("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen);
|
||||
|
||||
/* Update the accumulated size of the data read */
|
||||
|
||||
@@ -621,7 +621,7 @@ static uint16_t recvfrom_pktinterrupt(FAR struct net_driver_s *dev,
|
||||
{
|
||||
struct recvfrom_s *pstate = (struct recvfrom_s *)pvpriv;
|
||||
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
/* 'priv' might be null in some race conditions (?) */
|
||||
|
||||
@@ -636,7 +636,7 @@ static uint16_t recvfrom_pktinterrupt(FAR struct net_driver_s *dev,
|
||||
|
||||
/* We are finished. */
|
||||
|
||||
nllvdbg("PKT done\n");
|
||||
nllinfo("PKT done\n");
|
||||
|
||||
/* Don't allow any further call backs. */
|
||||
|
||||
@@ -778,7 +778,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
|
||||
#endif
|
||||
#endif
|
||||
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
/* 'priv' might be null in some race conditions (?) */
|
||||
|
||||
@@ -827,7 +827,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
|
||||
if (pstate->rf_recvlen > 0)
|
||||
#endif
|
||||
{
|
||||
nllvdbg("TCP resume\n");
|
||||
nllinfo("TCP resume\n");
|
||||
|
||||
/* The TCP receive buffer is full. Return now and don't allow
|
||||
* any further TCP call backs.
|
||||
@@ -864,7 +864,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
|
||||
|
||||
else if ((flags & TCP_DISCONN_EVENTS) != 0)
|
||||
{
|
||||
nllvdbg("Lost connection\n");
|
||||
nllinfo("Lost connection\n");
|
||||
|
||||
/* Stop further callbacks */
|
||||
|
||||
@@ -924,7 +924,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
|
||||
* callbacks
|
||||
*/
|
||||
|
||||
nllvdbg("TCP timeout\n");
|
||||
nllinfo("TCP timeout\n");
|
||||
|
||||
pstate->rf_cb->flags = 0;
|
||||
pstate->rf_cb->priv = NULL;
|
||||
@@ -1122,7 +1122,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev,
|
||||
{
|
||||
FAR struct recvfrom_s *pstate = (FAR struct recvfrom_s *)pvpriv;
|
||||
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
/* 'priv' might be null in some race conditions (?) */
|
||||
|
||||
@@ -1150,7 +1150,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev,
|
||||
|
||||
/* We are finished. */
|
||||
|
||||
nllvdbg("UDP done\n");
|
||||
nllinfo("UDP done\n");
|
||||
|
||||
/* Save the sender's address in the caller's 'from' location */
|
||||
|
||||
@@ -1176,7 +1176,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev,
|
||||
* callbacks
|
||||
*/
|
||||
|
||||
nllvdbg("ERROR: UDP timeout\n");
|
||||
nllinfo("ERROR: UDP timeout\n");
|
||||
|
||||
/* Terminate the transfer with an -EAGAIN error */
|
||||
|
||||
|
||||
@@ -246,7 +246,7 @@ int psock_tcp_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
|
||||
{
|
||||
/* Yes... get the address of the connected client */
|
||||
|
||||
nvdbg("Pending conn=%p\n", state.acpt_newconn);
|
||||
ninfo("Pending conn=%p\n", state.acpt_newconn);
|
||||
accept_tcpsender(psock, state.acpt_newconn, addr, addrlen);
|
||||
}
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
|
||||
|
||||
/* Handle the result based on the application response */
|
||||
|
||||
nllvdbg("result: %04x d_sndlen: %d conn->unacked: %d\n",
|
||||
nllinfo("result: %04x d_sndlen: %d conn->unacked: %d\n",
|
||||
result, dev->d_sndlen, conn->unacked);
|
||||
|
||||
/* Get the IP header length associated with the IP domain configured for
|
||||
@@ -124,7 +124,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
|
||||
|
||||
dev->d_sndlen = 0;
|
||||
conn->tcpstateflags = TCP_CLOSED;
|
||||
nllvdbg("TCP state: NETDEV_DOWN\n");
|
||||
nllinfo("TCP state: NETDEV_DOWN\n");
|
||||
}
|
||||
|
||||
/* Check for connection aborted */
|
||||
@@ -133,7 +133,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
|
||||
{
|
||||
dev->d_sndlen = 0;
|
||||
conn->tcpstateflags = TCP_CLOSED;
|
||||
nllvdbg("TCP state: TCP_CLOSED\n");
|
||||
nllinfo("TCP state: TCP_CLOSED\n");
|
||||
|
||||
tcp_send(dev, conn, TCP_RST | TCP_ACK, hdrlen);
|
||||
}
|
||||
@@ -145,7 +145,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
|
||||
conn->tcpstateflags = TCP_FIN_WAIT_1;
|
||||
conn->unacked = 1;
|
||||
conn->nrtx = 0;
|
||||
nllvdbg("TCP state: TCP_FIN_WAIT_1\n");
|
||||
nllinfo("TCP state: TCP_FIN_WAIT_1\n");
|
||||
|
||||
dev->d_sndlen = 0;
|
||||
tcp_send(dev, conn, TCP_FIN | TCP_ACK, hdrlen);
|
||||
@@ -210,7 +210,7 @@ void tcp_rexmit(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
|
||||
{
|
||||
uint8_t hdrlen;
|
||||
|
||||
nllvdbg("result: %04x d_sndlen: %d conn->unacked: %d\n",
|
||||
nllinfo("result: %04x d_sndlen: %d conn->unacked: %d\n",
|
||||
result, dev->d_sndlen, conn->unacked);
|
||||
|
||||
/* Get the IP header length associated with the IP domain configured for
|
||||
|
||||
@@ -77,7 +77,7 @@ int tcp_backlogcreate(FAR struct tcp_conn_s *conn, int nblg)
|
||||
int offset;
|
||||
int i;
|
||||
|
||||
nllvdbg("conn=%p nblg=%d\n", conn, nblg);
|
||||
nllinfo("conn=%p nblg=%d\n", conn, nblg);
|
||||
|
||||
#ifdef CONFIG_DEBUG
|
||||
if (!conn)
|
||||
@@ -161,7 +161,7 @@ int tcp_backlogdestroy(FAR struct tcp_conn_s *conn)
|
||||
FAR struct tcp_blcontainer_s *blc;
|
||||
FAR struct tcp_conn_s *blconn;
|
||||
|
||||
nllvdbg("conn=%p\n", conn);
|
||||
nllinfo("conn=%p\n", conn);
|
||||
|
||||
#ifdef CONFIG_DEBUG
|
||||
if (!conn)
|
||||
@@ -222,7 +222,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn, FAR struct tcp_conn_s *blconn)
|
||||
FAR struct tcp_blcontainer_s *blc;
|
||||
int ret = -EINVAL;
|
||||
|
||||
nllvdbg("conn=%p blconn=%p\n", conn, blconn);
|
||||
nllinfo("conn=%p blconn=%p\n", conn, blconn);
|
||||
|
||||
#ifdef CONFIG_DEBUG
|
||||
if (!conn)
|
||||
@@ -321,7 +321,7 @@ FAR struct tcp_conn_s *tcp_backlogremove(FAR struct tcp_conn_s *conn)
|
||||
}
|
||||
}
|
||||
|
||||
nllvdbg("conn=%p, returning %p\n", conn, blconn);
|
||||
nllinfo("conn=%p, returning %p\n", conn, blconn);
|
||||
return blconn;
|
||||
}
|
||||
|
||||
@@ -345,7 +345,7 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
|
||||
FAR struct tcp_blcontainer_s *blc;
|
||||
FAR struct tcp_blcontainer_s *prev;
|
||||
|
||||
nllvdbg("conn=%p blconn=%p\n", conn, blconn);
|
||||
nllinfo("conn=%p blconn=%p\n", conn, blconn);
|
||||
|
||||
#ifdef CONFIG_DEBUG
|
||||
if (!conn)
|
||||
|
||||
@@ -95,7 +95,7 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
|
||||
uint16_t recvlen;
|
||||
#endif
|
||||
|
||||
nllvdbg("No listener on connection\n");
|
||||
nllinfo("No listener on connection\n");
|
||||
|
||||
#ifdef CONFIG_NET_TCP_READAHEAD
|
||||
/* Save as the packet data as in the read-ahead buffer. NOTE that
|
||||
@@ -110,7 +110,7 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
|
||||
* read-ahead buffers to retain the data -- drop the packet.
|
||||
*/
|
||||
|
||||
nllvdbg("Dropped %d bytes\n", dev->d_len);
|
||||
nllinfo("Dropped %d bytes\n", dev->d_len);
|
||||
|
||||
#ifdef CONFIG_NET_STATISTICS
|
||||
g_netstats.tcp.syndrop++;
|
||||
@@ -152,7 +152,7 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev,
|
||||
* explicitly set in the callback.
|
||||
*/
|
||||
|
||||
nllvdbg("flags: %04x\n", flags);
|
||||
nllinfo("flags: %04x\n", flags);
|
||||
|
||||
/* Perform the data callback. When a data callback is executed from 'list',
|
||||
* the input flags are normally returned, however, the implementation
|
||||
@@ -275,7 +275,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer,
|
||||
return 0;
|
||||
}
|
||||
|
||||
nllvdbg("Buffered %d bytes\n", buflen);
|
||||
nllinfo("Buffered %d bytes\n", buflen);
|
||||
return buflen;
|
||||
}
|
||||
#endif /* CONFIG_NET_TCP_READAHEAD */
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user