diff -c ../6.0.0a5/names.c ./names.c *** ../6.0.0a5/names.c Wed Sep 8 06:35:13 1999 --- ./names.c Fri Jun 1 10:43:59 2001 *************** *** 86,92 **** /* get port name as a string */ ! pse = getservbyport(port,"tcp"); if (pse != NULL) { sb_port = pse->s_name; } else { --- 86,92 ---- /* get port name as a string */ ! pse = getservbyport(htons(port),"tcp"); if (pse != NULL) { sb_port = pse->s_name; } else { diff -c ../6.0.0a5/trace.c ./trace.c *** ../6.0.0a5/trace.c Mon Apr 16 13:33:48 2001 --- ./trace.c Fri Jun 1 10:56:04 2001 *************** *** 1044,1049 **** --- 1044,1066 ---- if (thisdir->fin_count > 1) --retrans; } + if (RESET_SET(ptcp)) { + /* if RST segment to include data, then don't count it + * it is NOT regular TCP byte stream + * + * RFC 1122 says: + * 4.2.2.12 RST Segment: RFC-793 Section 3.4 + * + * A TCP SHOULD allow a received RST segment to include data. + * + * DISCUSSION + * It has been suggested that a RST segment could contain + * ASCII text that encoded and explained the cause of the + * RST. No standard has yet been established for such + * data. + */ + len = 0; + } if (retrans < len) thisdir->unique_bytes += (len - retrans); }