- merge revision 1.3

date: 2005/01/17 20:07:16;  author: mlhuang;  state: Exp;  lines: +10 -2
- patch from https://bugzilla.netfilter.org/bugzilla/show_bug.cgi?id=40
  fixes crash if PPTP packets are received out of order
- PPTP headers are variable length. Specifically, PPTP ACKs without
  sequence numbers are 4 bytes shorter and will not be properly
  tracked. Pass the minimum length required to skb_header_pointer() when
  trying to parse a generic PPTP header out of a packet.
- Fix a call to DUMP_TUPLE_GRE()
- merge revision 1.2
date: 2005/01/10 19:06:38;  author: mlhuang;  state: Exp;  lines: +12 -13
- fix DEBUGP() macro; newer gcc versions refuse to concatenate __FILE__
  and __FUNCTION__
- fix DUMP_TUPLE_GRE() macro
- 2.6.9 changed print_tuple() and print_conntrack() methods to use
  seq_printf(), but we are running 2.6.8, so change to just sprintf()
- merge revision 1.1
date: 2005/01/10 18:29:17;  author: mlhuang;  state: Exp;
patch-o-matic-ng-20050103 pptp-conntrack-nat