vbuell at gmail
Apr 11, 2008, 12:22 PM
Post #10 of 11
(976 views)
Permalink
|
|
Re: merge vpnc-nortel with trunk (phase 1)
[In reply to]
|
|
Hi
I think we can replace vpnc-nortel branch with Zingo version now.
Also I suggest to completely remove NORTELVPN_XAUTHTYPE_AS_REQUEST section
since it doesn't work practically for everyone:
--- vpnc_zingo.c 2008-04-11 22:11:25.000000000 +0300
+++ vpnc.c 2008-04-11 22:12:52.000000000 +0300
@@ -2175,15 +2175,8 @@
switch (ap->type) {
case ISAKMP_XAUTH_ATTRIB_TYPE:
-#ifdef NORTELVPN_XAUTHTYPE_AS_REQUEST
if (ap->af != isakmp_attr_16 || !(ap->u.attr_16 == 0 ||
ap->u.attr_16 == 5))
reject = ISAKMP_N_ATTRIBUTES_NOT_SUPPORTED;
- xauth_type_requested = ap->u.attr_16;
-#else
-
- if (ap->af != isakmp_attr_16 || ap->u.attr_16 != 0)
- reject = ISAKMP_N_ATTRIBUTES_NOT_SUPPORTED;
-#endif
break;
case ISAKMP_XAUTH_ATTRIB_USER_NAME:
case ISAKMP_XAUTH_ATTRIB_USER_PASSWORD:
Thanks,
Volodymyr
On Thu, Mar 6, 2008 at 12:52 PM, Zingo Andersen <spamfilter[at]zingo.org>
wrote:
> Hello
> I'm wondering what to do with this code
> It works for me and a few others but Vladimir Buell has problems with it
> that still has to be smoked out
>
> This probably means that it should not replace the vpnc-nortel branch
> until Vladimir's problems are fixed.
>
> Might I suggest that this should get a new branch made from rev 284 so
> that diffs and merges could be made easy with
> the main branch?
>
> --
> Zingo "Stefan" Andersen (zingo.org and vectrace.com)
>
> Zingo Andersen wrote:
> > Hello
> >
> > I have merged in latest from trunk to my vpnc-nortel setup and manage to
> get it usable
> > I tried to re-struct it back as much as possible to follow the trunk
> code base.
> > I tried to put all important difference behind a build flag ( NORTELVPN
> ) so that
> > the code for nortel and non nortel could coexist e.g. the branch could
> be removed.
> > ( Well maybe after some more code cleanup. )
> >
> > The latest fix on vpnc-nortel branch did breake my setup so I have put
> it
> > under another build flag ( NORTELVPN_XAUTHTYPE_AS_REQUEST ) until
> someone know
> > how to fix it.
> >
> > I don't know anything about VPN stuff so my remaining difference might
> be done better
> > please let me know.
> >
> > Next step would be better cleanup and if possible a runtime check
> instead of this
> > "#ifdef NORTELVPN" madness. The Idea was to bring it up to par with
> trunk so that
> > someone that knows the code could look at it merge it in easier or give
> more
> > instruction on what needs to be fixed.
> >
> > I have put all my file and a patch file against vpnc-nortel
> > on my website, since the patch is rather big (changes from 43 to 284)
> > I don't know what should be easier to use if it should be applied.
> > I recommend using the file list instead of the patch and check it
> > against trunk:284
> >
> > vpnc-nortel merged with trunk/284 (latest of today 20080203)
> >
> > All files:
> > http://www.zingo.org/webtest/vpnc-nortel_merge_with_284.tar.gz
> >
> > Or a patch on latest vpnc-nortel to bring it up to 284 (lots of changes)
> >
> > http://www.zingo.org/webtest/vpnc-nortel_merge_with_284.patch
> >
> > Hope this make anyone happy :)
> >
> > --
> > Zingo "Stefan" Andersen (zingo.org and vectrace.com)
> > I'm a signature file virus! Copy me into your signature. Please?
> >
> >
> >
> > _______________________________________________
> > vpnc-devel mailing list
> > vpnc-devel[at]unix-ag.uni-kl.de
> > https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
> > http://www.unix-ag.uni-kl.de/~massar/vpnc/<http://www.unix-ag.uni-kl.de/%7Emassar/vpnc/>
> >
>
>
> _______________________________________________
> vpnc-devel mailing list
> vpnc-devel[at]unix-ag.uni-kl.de
> https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
> http://www.unix-ag.uni-kl.de/~massar/vpnc/<http://www.unix-ag.uni-kl.de/%7Emassar/vpnc/>
>
>
--
Thanks,
Volodymyr
|
