Page MenuHomeFreeBSD
Files F144222083

D40234.id.diff
No OneTemporary
Actions

D40234.id.diff
View Options

diff --git a/sys/gdb/netgdb.c b/sys/gdb/netgdb.c
--- a/sys/gdb/netgdb.c
+++ b/sys/gdb/netgdb.c
@@ -114,11 +114,8 @@
* Receive non-TX ACK packets on the client port.
*
* The mbuf chain will have all framing headers removed (ethernet, inet, udp,
- * debugnet). If m_pullup is used, the supplied in-out mbuf pointer should be
- * updated appropriately.
- *
- * If the handler frees the mbuf chain, it should set the mbuf pointer
- * to NULL. Otherwise, the debugnet input framework will free the
+ * debugnet). If the handler frees the mbuf chain, it should set the mbuf pointer
+ * to NULL. Otherwise, the debugnet input framework will free the
* chain.
*/
static int
@@ -376,7 +373,7 @@
gdb_return_to_ddb = true;
db_printf("(detaching GDB will return control to DDB)\n");
- const in_addr_t *proxy_addr = debugnet_get_server(netgdb_conn);
+ const in_addr_t *proxy_addr = debugnet_get_server_addr(netgdb_conn);
const uint16_t proxy_port = debugnet_get_server_port(netgdb_conn) + 1;
inet_ntop(AF_INET, proxy_addr, proxy_buf, sizeof(proxy_buf));
if (inet_ntop(AF_INET, proxy_addr, proxy_buf, sizeof(proxy_buf)) == NULL) {
diff --git a/sys/net/debugnet.h b/sys/net/debugnet.h
--- a/sys/net/debugnet.h
+++ b/sys/net/debugnet.h
@@ -213,7 +213,7 @@
/*
* Get the connected server address.
*/
-const in_addr_t *debugnet_get_server(const struct debugnet_pcb *);
+const in_addr_t *debugnet_get_server_addr(const struct debugnet_pcb *);
/*
* Get the connected server port.
diff --git a/sys/net/debugnet.c b/sys/net/debugnet.c
--- a/sys/net/debugnet.c
+++ b/sys/net/debugnet.c
@@ -116,7 +116,7 @@
}
const in_addr_t *
-debugnet_get_server(const struct debugnet_pcb *pcb)
+debugnet_get_server_addr(const struct debugnet_pcb *pcb)
{
MPASS(g_debugnet_pcb_inuse && pcb == &g_dnet_pcb &&
pcb->dp_state >= DN_STATE_GOT_HERALD_PORT);
@@ -432,8 +432,8 @@
dnh = NULL;
error = pcb->dp_rx_handler(m);
if (error != 0) {
- DNETDEBUG("RX handler was not able to accept message, "
- "skipping ack.\n");
+ DNETDEBUG("RX handler was not able to accept message, error %d. "
+ "Skipping ack.\n", error);
return;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 7, 5:15 PM (18 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28457556
Default Alt Text
D40234.id.diff (2 KB)

Event Timeline