[Swan] Who changed parser.l ????
Philippe Vouters
philippe.vouters at laposte.net
Tue Jan 8 20:28:21 EET 2013
Wouldn't this code sequence be the best compromise for parser.l to best
match an EOF at EOL condition as well as matching Nick's files ?
<<EOF>> {
/*
static int once = 0;
if (once = !once) {
stacktop->line++;
} else if(parser_y_eof()) {
yyterminate();
}
*/
if(parser_y_eof()) {
yyterminate();
}
if (stacktop->file != NULL) {
yyterminate();
}
}
In my /etc/ipsec.conf, I have set:
include /etc/ipsec.d/*.conf
[philippe at victor C]$ sudo su
[root at victor C]# ls /etc/ipsec.d/*.conf
/etc/ipsec.d/ipsec.unmanaged.david.conf
/etc/ipsec.d/ipsec.unmanaged.mumin.conf
/etc/ipsec.d/ipsec.unmanaged.paulin.conf
/etc/ipsec.d/vouters.conf
[root at victor C]#
[philippe at victor C]$ sudo /usr/local/sbin/ipsec addconn --verbose
--autoall opening file: /etc/ipsec.conf
debugging mode enabled
including file '/etc/ipsec.d/*.conf'(/etc/ipsec.d/*.conf) from line
/etc/ipsec.conf:26
*end of file* /etc/ipsec.d/vouters.conf
*resuming */etc/ipsec.conf line 26
*end of file* /etc/ipsec.conf
Loading default conn
starter: case KH_NOTSET: empty
starter: case KH_NOTSET: empty
Loading conn david
Loading conn mumin
starter: case KH_DEFAULTROUTE: empty
Loading conn paulin
starter: case KH_DEFAULTROUTE: empty
Loading conn roadwarrior-l2tp-updatedwin
while loading conn 'roadwarrior-l2tp-updatedwin' also including
'roadwarrior'
starter: case KH_DEFAULTROUTE: empty
Loading conn roadwarrior-l2tp
while loading conn 'roadwarrior-l2tp' also including 'roadwarrior'
starter: case KH_DEFAULTROUTE: empty
Loading conn macintosh-l2tp
while loading conn 'macintosh-l2tp' also including 'roadwarrior'
starter: case KH_DEFAULTROUTE: empty
Loading conn roadwarrior
starter: case KH_DEFAULTROUTE: empty
loading all conns according to their auto= settings
Pass #1: Loading auto=add and auto=route connections
david
parse_src = 0, parse_gateway = 1, has_dst = 1
dst 88.98.137.158 via 192.168.1.1 dev eth0 src 192.168.1.2
set nexthop: 192.168.1.1
002 "david": deleting connection
002 added connection description "david"
mumin
parse_src = 1, parse_gateway = 0, has_dst = 0
dst via 192.168.1.1 dev eth0 src
dst 169.254.0.0 via dev eth0 src
dst 192.168.1.0 via dev eth0 src 192.168.1.2
set addr: 192.168.1.2
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.1 via dev lo src 127.0.0.1
dst 127.255.255.255 via dev lo src 127.0.0.1
dst 192.168.1.0 via dev eth0 src 192.168.1.2
dst 192.168.1.2 via dev eth0 src 192.168.1.2
dst 192.168.1.255 via dev eth0 src 192.168.1.2
002 "mumin": deleting connection
002 added connection description "mumin"
paulin
parse_src = 1, parse_gateway = 0, has_dst = 0
dst via 192.168.1.1 dev eth0 src
dst 169.254.0.0 via dev eth0 src
dst 192.168.1.0 via dev eth0 src 192.168.1.2
set addr: 192.168.1.2
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.1 via dev lo src 127.0.0.1
dst 127.255.255.255 via dev lo src 127.0.0.1
dst 192.168.1.0 via dev eth0 src 192.168.1.2
dst 192.168.1.2 via dev eth0 src 192.168.1.2
dst 192.168.1.255 via dev eth0 src 192.168.1.2
002 "paulin": deleting connection
002 added connection description "paulin"
roadwarrior-l2tp-updatedwin
parse_src = 1, parse_gateway = 0, has_dst = 0
dst via 192.168.1.1 dev eth0 src
dst 169.254.0.0 via dev eth0 src
dst 192.168.1.0 via dev eth0 src 192.168.1.2
set addr: 192.168.1.2
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.1 via dev lo src 127.0.0.1
dst 127.255.255.255 via dev lo src 127.0.0.1
dst 192.168.1.0 via dev eth0 src 192.168.1.2
dst 192.168.1.2 via dev eth0 src 192.168.1.2
dst 192.168.1.255 via dev eth0 src 192.168.1.2
002 "roadwarrior-l2tp-updatedwin": deleting connection
002 added connection description "roadwarrior-l2tp-updatedwin"
roadwarrior-l2tp
parse_src = 1, parse_gateway = 0, has_dst = 0
dst via 192.168.1.1 dev eth0 src
dst 169.254.0.0 via dev eth0 src
dst 192.168.1.0 via dev eth0 src 192.168.1.2
set addr: 192.168.1.2
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.1 via dev lo src 127.0.0.1
dst 127.255.255.255 via dev lo src 127.0.0.1
dst 192.168.1.0 via dev eth0 src 192.168.1.2
dst 192.168.1.2 via dev eth0 src 192.168.1.2
dst 192.168.1.255 via dev eth0 src 192.168.1.2
002 "roadwarrior-l2tp": deleting connection
002 added connection description "roadwarrior-l2tp"
macintosh-l2tp
parse_src = 1, parse_gateway = 0, has_dst = 0
dst via 192.168.1.1 dev eth0 src
dst 169.254.0.0 via dev eth0 src
dst 192.168.1.0 via dev eth0 src 192.168.1.2
set addr: 192.168.1.2
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.1 via dev lo src 127.0.0.1
dst 127.255.255.255 via dev lo src 127.0.0.1
dst 192.168.1.0 via dev eth0 src 192.168.1.2
dst 192.168.1.2 via dev eth0 src 192.168.1.2
dst 192.168.1.255 via dev eth0 src 192.168.1.2
002 "macintosh-l2tp": deleting connection
002 added connection description "macintosh-l2tp"
roadwarrior
parse_src = 1, parse_gateway = 0, has_dst = 0
dst via 192.168.1.1 dev eth0 src
dst 169.254.0.0 via dev eth0 src
dst 192.168.1.0 via dev eth0 src 192.168.1.2
set addr: 192.168.1.2
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.0 via dev lo src 127.0.0.1
dst 127.0.0.1 via dev lo src 127.0.0.1
dst 127.255.255.255 via dev lo src 127.0.0.1
dst 192.168.1.0 via dev eth0 src 192.168.1.2
dst 192.168.1.2 via dev eth0 src 192.168.1.2
dst 192.168.1.255 via dev eth0 src 192.168.1.2
002 "roadwarrior": deleting connection
002 added connection description "roadwarrior"
Pass #2: Loading auto=start connections
Yours truly,
Philippe
Philippe Vouters (Fontainebleau/France)
URL: http://vouters.dyndns.org/
SIP: sip:Vouters at sip.linphone.org
Le 08/01/2013 17:48, Wes Hardaker a écrit :
> Philippe Vouters <philippe.vouters at laposte.net> writes:
>
>> Wes,
>>
>> If you remember your test case, wouldn't this code in parser.l do the trick:
>> <<EOF>> {
>> static int once = 0;
>> if (once = !once) {
>> stacktop->line++;
>> } else if(parser_y_eof()) {
>> yyterminate();
>> }
>> }
> I actually thought I tried that at one point, but I'll give it another
> shot in case I hadn't.
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.libreswan.org/pipermail/swan/attachments/20130108/4b451982/attachment.html>
More information about the Swan
mailing list