The SCTP dissector is only called for SCTP packets, so there's no reason
for it to check the protocol number in the IP header.

Have the IPv6 dissector call the SCTP dissector for SCTP packets.

Get rid of the definition of IPPROTO_SCTP in sctpConstants.h, so we
don't have problems if <netinet/in.h> also defines it.
3 files changed
tree: a2f3559868634d8ed1b884f95831950021cc3c37
  1. lbl/
  2. missing/
  3. tests/
  4. win32/
  5. .cvsignore
  6. acconfig.h
  7. aclocal.m4
  8. addrtoname.c
  9. addrtoname.h
  10. ah.h
  11. appletalk.h
  12. arcnet.h
  13. atime.awk
  14. atm.h
  15. atmuni31.h
  16. bootp.h
  17. bpf_dump.c
  18. CHANGES
  19. chdlc.h
  20. config.guess
  21. config.h.in
  22. config.sub
  23. configure
  24. configure.in
  25. CREDITS
  26. decnet.h
  27. enc.h
  28. esp.h
  29. ether.h
  30. ethertype.h
  31. extract.h
  32. fddi.h
  33. FILES
  34. gmt2local.c
  35. gmt2local.h
  36. icmp6.h
  37. ieee802_11.h
  38. igrp.h
  39. INSTALL
  40. install-sh
  41. interface.h
  42. ip.h
  43. ip6.h
  44. ipfc.h
  45. ipsec_doi.h
  46. ipx.h
  47. isakmp.h
  48. l2tp.h
  49. lane.h
  50. LICENSE
  51. llc.h
  52. machdep.c
  53. machdep.h
  54. Makefile-devel-adds
  55. Makefile.in
  56. makemib
  57. mib.h
  58. mkdep
  59. nameser.h
  60. netbios.h
  61. nfs.h
  62. nfsfh.h
  63. ntp.h
  64. oakley.h
  65. ospf.h
  66. ospf6.h
  67. packetdat.awk
  68. parsenfsfh.c
  69. pcap-missing.h
  70. PLATFORMS
  71. ppp.h
  72. print-802_11.c
  73. print-ah.c
  74. print-arcnet.c
  75. print-arp.c
  76. print-ascii.c
  77. print-atalk.c
  78. print-atm.c
  79. print-beep.c
  80. print-bgp.c
  81. print-bootp.c
  82. print-cdp.c
  83. print-chdlc.c
  84. print-cip.c
  85. print-cnfp.c
  86. print-decnet.c
  87. print-dhcp6.c
  88. print-domain.c
  89. print-dvmrp.c
  90. print-egp.c
  91. print-enc.c
  92. print-esp.c
  93. print-ether.c
  94. print-fddi.c
  95. print-fr.c
  96. print-frag6.c
  97. print-gre.c
  98. print-hsrp.c
  99. print-icmp.c
  100. print-icmp6.c
  101. print-igmp.c
  102. print-igrp.c
  103. print-ip.c
  104. print-ip6.c
  105. print-ip6opts.c
  106. print-ipcomp.c
  107. print-ipfc.c
  108. print-ipx.c
  109. print-isakmp.c
  110. print-isoclns.c
  111. print-krb.c
  112. print-l2tp.c
  113. print-lane.c
  114. print-ldp.c
  115. print-llc.c
  116. print-lwres.c
  117. print-mobile.c
  118. print-mobility.c
  119. print-mpls.c
  120. print-msdp.c
  121. print-netbios.c
  122. print-nfs.c
  123. print-ntp.c
  124. print-null.c
  125. print-ospf.c
  126. print-ospf6.c
  127. print-pflog.c
  128. print-pim.c
  129. print-ppp.c
  130. print-pppoe.c
  131. print-pptp.c
  132. print-radius.c
  133. print-raw.c
  134. print-rip.c
  135. print-ripng.c
  136. print-rsvp.c
  137. print-rt6.c
  138. print-rx.c
  139. print-sctp.c
  140. print-sl.c
  141. print-sll.c
  142. print-smb.c
  143. print-snmp.c
  144. print-stp.c
  145. print-sunatm.c
  146. print-sunrpc.c
  147. print-tcp.c
  148. print-telnet.c
  149. print-tftp.c
  150. print-timed.c
  151. print-token.c
  152. print-udp.c
  153. print-vjc.c
  154. print-vrrp.c
  155. print-wb.c
  156. print-zephyr.c
  157. README
  158. Readme.Win32
  159. route6d.h
  160. rx.h
  161. sctpConstants.h
  162. sctpHeader.h
  163. send-ack.awk
  164. setsignal.c
  165. setsignal.h
  166. slcompress.h
  167. slip.h
  168. sll.h
  169. smb.h
  170. smbutil.c
  171. stime.awk
  172. strcasecmp.c
  173. tcp.h
  174. tcpdump-stdinc.h
  175. tcpdump.1
  176. tcpdump.c
  177. telnet.h
  178. timed.h
  179. TODO
  180. token.h
  181. udp.h
  182. util.c
  183. VERSION
  184. vfprintf.c