Patch fails (Ubuntu 6.10, 2.6.17-11-generic)

Hi Alan,

thanks for writing an excellent tutorial. Unfortunately it seems not all cases were covered :).

I am running an (up-to-date) Ubuntu 6.10 and the error I get is during the patch application. Of course all things ran as su


patch -p0 < vpnclient-linux-4.7.patch.txt
patching file linuxcniapi.c
Hunk #2 FAILED at 291.
Hunk #3 succeeded at 403 (offset 9 lines).
Hunk #4 FAILED at 445.
2 out of 4 hunks FAILED -- saving rejects to file linuxcniapi.c.rej

The content of the .rej file is:

//START OF FILE

***************
*** 289,295 ****
goto exit_gracefully;
}
/* move the data into the packet */
- do_gettimeofday(&skb->stamp);

pIP = skb_put(skb, lpPacketDescriptor->uiPacketSize);

--- 291,300 ----
goto exit_gracefully;
}
/* move the data into the packet */
+ do_gettimeofday(&timecount);
+
+ skb->tstamp.off_sec = (u32) timecount.tv_sec;
+ skb->tstamp.off_usec = (u32) timecount.tv_usec;

pIP = skb_put(skb, lpPacketDescriptor->uiPacketSize);

***************
*** 438,444 ****
CniGetPacketData(Packet, 0, lpPacketDescriptor->uiPacketSize, pIP);

/* put the mac header on */
- do_gettimeofday(&skb->stamp);

skb->dev = pBinding->pDevice;

--- 445,454 ----
CniGetPacketData(Packet, 0, lpPacketDescriptor->uiPacketSize, pIP);

/* put the mac header on */
+ do_gettimeofday(&timecount);
+
+ skb->tstamp.off_sec = (u32) timecount.tv_sec;
+ skb->tstamp.off_usec = (u32) timecount.tv_usec;

skb->dev = pBinding->pDevice;


//END OF FILE

My 'uname -r' is

2.6.17-11-generic

I used:

http://www.cisco.com/en/US/products/sw/secursw/ps2308/products_user_guide_chapter09186a0080234617.html

and my campus guidelines for windows to create a connection

I am still able to do all the next steps and try to log in to the campus network
but in the end get a:


Initiating TCP to X.X.X.X port YYYY IPSec over TCP
Contacting the gateway at X.X.X.X
Secure VPN Connection terminated locally by the Client
Reason: Remote peer is no longer responding.
There are no new notification messages at this time.

Do you think it's my profile that's incorrect or really something about this patching that makes a difference?

With kind regards,
Marek Barwinski

Reply

The content of this field is kept private and will not be shown publicly.
  • Allowed HTML tags: <a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>
  • Lines and paragraphs break automatically.

More information about formatting options