Thread: [Ipsec-tools-commits] ipsec-tools/src/racoon isakmp.c,1.30,1.31
Brought to you by:
mit_warlord,
netbsd
From: Emmanuel D. <ma...@us...> - 2004-12-17 08:51:44
|
Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13772/src/racoon Modified Files: isakmp.c Log Message: Remove a spurious error message by not attempting to configure NAT-T on non IPv4 addresses. Index: isakmp.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- isakmp.c 22 Nov 2004 17:21:31 -0000 1.30 +++ isakmp.c 17 Dec 2004 08:51:28 -0000 1.31 @@ -1584,9 +1584,9 @@ saddr2str(p->addr), p->sock); #ifdef ENABLE_NATT - if (p->udp_encap) - { + if (p->udp_encap && (p->addr->sa_family == AF_INET)) { int option = UDP_ENCAP_ESPINUDP; + if (setsockopt (p->sock, SOL_UDP, UDP_ENCAP, &option, sizeof (option)) < 0) { plog(LLV_ERROR, LOCATION, NULL, |