Page MenuHomeFreeBSD
Files F154060941

D3530.id8722.diff
No OneTemporary
Actions

D3530.id8722.diff
View Options

Index: cddl/lib/libdtrace/tcp.d
===================================================================
--- cddl/lib/libdtrace/tcp.d
+++ cddl/lib/libdtrace/tcp.d
@@ -180,7 +180,7 @@
tcps_addr = (uintptr_t)p;
tcps_local = -1; /* XXX */
tcps_active = -1; /* XXX */
- tcps_lport= p == NULL ? 0 : ntohs(p->t_inpcb->inp_inc.inc_ie.ie_lport);
+ tcps_lport = p == NULL ? 0 : ntohs(p->t_inpcb->inp_inc.inc_ie.ie_lport);
tcps_rport = p == NULL ? 0 : ntohs(p->t_inpcb->inp_inc.inc_ie.ie_fport);
tcps_laddr = p == NULL ? 0 :
p->t_inpcb->inp_vflag == INP_IPV4 ?
Index: share/dtrace/tcpdebug
===================================================================
--- share/dtrace/tcpdebug
+++ share/dtrace/tcpdebug
@@ -88,14 +88,16 @@
printf("@%x, urp=%x", ack, args[1]->tcp_urgent);
- printf("<");
+ printf("%s", flags != 0 ? "<" : "");
printf("%s", flags & TH_SYN ? "SYN," :"");
printf("%s", flags & TH_ACK ? "ACK," :"");
printf("%s", flags & TH_FIN ? "FIN," :"");
printf("%s", flags & TH_RST ? "RST," :"");
printf("%s", flags & TH_PUSH ? "PUSH," :"");
- printf("%s", flags & TH_URG ? "URG" :"");
- printf(">");
+ printf("%s", flags & TH_URG ? "URG," :"");
+ printf("%s", flags & TH_ECE ? "ECE," :"");
+ printf("%s", flags & TH_CWR ? "CWR" :"");
+ printf("%s", flags != 0 ? ">" : "");
printf("\n");
printf("\trcv_(nxt,wnd,up) (%u,%x,%x) snd_(una,nxt,max) (%x,%x,%x)\n",
@@ -123,14 +125,16 @@
printf("@%x, urp=%x", ack, args[1]->tcp_urgent);
- printf("<");
+ printf("%s", flags != 0 ? "<" : "");
printf("%s", flags & TH_SYN ? "SYN," :"");
printf("%s", flags & TH_ACK ? "ACK," :"");
printf("%s", flags & TH_FIN ? "FIN," :"");
printf("%s", flags & TH_RST ? "RST," :"");
printf("%s", flags & TH_PUSH ? "PUSH," :"");
- printf("%s", flags & TH_URG ? "URG" :"");
- printf(">");
+ printf("%s", flags & TH_URG ? "URG," :"");
+ printf("%s", flags & TH_ECE ? "ECE," :"");
+ printf("%s", flags & TH_CWR ? "CWR" :"");
+ printf("%s", flags != 0 ? ">" : "");
printf("\n");
printf("\trcv_(nxt,wnd,up) (%x,%x,%x) snd_(una,nxt,max) (%x,%x,%x)\n",
Index: sys/netinet/tcp_input.c
===================================================================
--- sys/netinet/tcp_input.c
+++ sys/netinet/tcp_input.c
@@ -105,7 +105,9 @@
#include <netinet6/tcp6_var.h>
#include <netinet/tcpip.h>
#include <netinet/tcp_syncache.h>
+#ifdef TCPDEBUG
#include <netinet/tcp_debug.h>
+#endif /* TCPDEBUG */
#ifdef TCP_OFFLOAD
#include <netinet/tcp_offload.h>
#endif

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 26, 8:36 PM (9 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32173299
Default Alt Text
D3530.id8722.diff (2 KB)

Event Timeline