a0d2bc60bb
into add without problems. The previous commit had the other half of this original patch which handled tcpflags/tcpflgs confusion in output/input.