Deepak Jain wrote:
I have added support for l2tp version 3. I have modified
the packet-l2tp.c file (which supported version 2 earlier).
Please include it in the next build.
Unfortunately, the patch appears to have a blank line inserted between
each pair of lines in the patch, so patch reports it as being malformed.
It's too big to fix by hand, and I don't know whether the blank lines
are all really blank (i.e., if they'd be matched by the regular
expression "^$") or whether the only blank lines are the extra lines, so
I'm reluctant to try using an editor to remove the blank lines.
(Your mail seems to be double-spaced in its entirety, including the
paragraph above that I inclujded, so I suspect that your mail
application is being "helpful" and double-spacing all text in the
message - including the patch.)
Furthermore, you'd sent in a new version of packet-l2tp.c earlier to add
L2TP version 3 support:
http://www.ethereal.com/lists/ethereal-dev/200501/msg00178.html
and, although that wasn't a patch - patches, *IF* they can be applied
using "patch" (which means "as long as they haven't been word-wrapped,
or otherwise reformatted, by a 'helpful' mail application), and are
"context" or "unified" diffs (rather than patches that include no
context) are better than new versions of files, as they can usually be
applied to a file even if the file has changed since the changes were
made - in this case the file hadn't changed in a while, so the new
version of the file could be used, and, in fact, I've already checked it
in, with some cleanups:
http://www.ethereal.com/lists/ethereal-dev/200501/msg00187.html
so if the patch has the same changes, it's already been included.
If the patch doesn't have the same changes, could you send the patch
again, as a patch to the current version of the file in Subversion
(rather than, for example, the version in Ethereal 0.10.8), and see if
you can send the patch as an attachment separate from the message body
(preferably not an inline attachment)?
If the patch *does* have the same changes, please let us know.
