Attachment #68200 for bug #94681




	# if searching, seen is set of sectionnames which match
	# if not searching, seen is set of parameter names found
	seen[""] = ""
	conndefault[""] = ""
	usesdefault[""] = ""
	orientation = 1
}

			output(o_section, sn)

			# do not accept anything from conn %default
			for (i in conndefault)
				delete conndefault[i]

			output(o_parm, orient("left"), "%defaultroute")
			output(o_parm, orient("leftid"), "%myid")

		if (!usesdefault[sectionname])
			fail("duplicated parameter " bq search eq)
		usesdefault[sectionname] = 0
	} else if (search in conndefault)
		fail("duplicated parameter " bq search eq)
	if (rest in wanted) {	# a hit
		if (indefault)
			conndefault[search] = rest
		else
			searchfound(sectionname)
	} else {

		fail("white space within non-quoted parameter " bq name eq)
}
indefault {
	if (name in conndefault)
		fail("duplicated default parameter " bq name eq)
	conndefault[name] = value
	next
}
{

	if (!optional && !searching && unseen != "")
		fail("did not find " type " section(s) " bq substr(unseen, 2) eq)
	if (!searching) {
		for (name in conndefault)
			if (!(name in seen))
				output(o_parm, name, conndefault[name])
	} else {
		if (conndefault[search] in wanted)
			for (name in usesdefault)
				if (usesdefault[name])
					seen[name] = 1




	# if searching, seen is set of sectionnames which match
	# if not searching, seen is set of parameter names found
	seen[""] = ""
	conndefault[""] = ""
	usesdefault[""] = ""
	orientation = 1
}

			output(o_section, sn)

			# do not accept anything from conn %default
			for (i in conndefault)
				delete conndefault[i]

			output(o_parm, orient("left"), "%defaultroute")
			output(o_parm, orient("leftid"), "%myid")

		if (!usesdefault[sectionname])
			fail("duplicated parameter " bq search eq)
		usesdefault[sectionname] = 0
	} else if (search in conndefault)
		fail("duplicated parameter " bq search eq)
	if (rest in wanted) {	# a hit
		if (indefault)
			conndefault[search] = rest
		else
			searchfound(sectionname)
	} else {

		fail("white space within non-quoted parameter " bq name eq)
}
indefault {
	if (name in conndefault)
		fail("duplicated default parameter " bq name eq)
	conndefault[name] = value
	next
}
{

	if (!optional && !searching && unseen != "")
		fail("did not find " type " section(s) " bq substr(unseen, 2) eq)
	if (!searching) {
		for (name in conndefault)
			if (!(name in seen))
				output(o_parm, name, conndefault[name])
	} else {
		if (conndefault[search] in wanted)
			for (name in usesdefault)
				if (usesdefault[name])
					seen[name] = 1




		if ((k in s) && s[k] != "yes" && s[k] != "no")
			fail("parameter \"" k "\" must be \"yes\" or \"no\"")
	}
	function conndefault(k, v) {
		if (!(k in s))
			s[k] = v
	}

	#########
	if (failed)
		exit 1
	conndefault("type", "tunnel")
	type = s["type"]
	shunt = 0
	if (type == "transport") {

	}

	leftsub = ("leftsubnet" in s) ? 1 : 0
	conndefault("leftsubnet", s["left"] "/32")
	rightsub = ("rightsubnet" in s) ? 1 : 0
	conndefault("rightsubnet", s["right"] "/32")
	integer("espreplay_window")
	if (("espreplay_window" in s) && s["espreplay_window"] == 0)
		delete s["espreplay_window"]

	netfix("left")
	netfix("right")

	conndefault("leftnexthop", s["right"])
	conndefault("rightnexthop", s["left"])
	if (s["leftnexthop"] == s["left"])
		fail("left and leftnexthop must not be the same")
	if (s["rightnexthop"] == s["right"])

Return to bug 94681

Lines 181-187 awk 'BEGIN { Link Here

(-)/usr/lib/ipsec/_confread.ORIG (-10 / +10 lines)
181	# if searching, seen is set of sectionnames which match	181	# if searching, seen is set of sectionnames which match
182	# if not searching, seen is set of parameter names found	182	# if not searching, seen is set of parameter names found
183	seen[""] = ""	183	seen[""] = ""
184	default[""] = ""	184	conndefault[""] = ""
185	usesdefault[""] = ""	185	usesdefault[""] = ""
186	orientation = 1	186	orientation = 1
187	}	187	}
Lines 286-293 function jam(sn, au) { Link Here
286	output(o_section, sn)	286	output(o_section, sn)
287		287
288	# do not accept anything from conn %default	288	# do not accept anything from conn %default
289	for (i in default)	289	for (i in conndefault)
290	delete default[i]	290	delete conndefault[i]
291		291
292	output(o_parm, orient("left"), "%defaultroute")	292	output(o_parm, orient("left"), "%defaultroute")
293	output(o_parm, orient("leftid"), "%myid")	293	output(o_parm, orient("leftid"), "%myid")
Lines 425-435 searching && $0 ~ searchpat { Link Here
425	if (!usesdefault[sectionname])	425	if (!usesdefault[sectionname])
426	fail("duplicated parameter " bq search eq)	426	fail("duplicated parameter " bq search eq)
427	usesdefault[sectionname] = 0	427	usesdefault[sectionname] = 0
428	} else if (search in default)	428	} else if (search in conndefault)
429	fail("duplicated parameter " bq search eq)	429	fail("duplicated parameter " bq search eq)
430	if (rest in wanted) { # a hit	430	if (rest in wanted) { # a hit
431	if (indefault)	431	if (indefault)
432	default[search] = rest	432	conndefault[search] = rest
433	else	433	else
434	searchfound(sectionname)	434	searchfound(sectionname)
435	} else {	435	} else {
Lines 491-499 $0 ~ /^(also\|alsoflip)=/ { Link Here
491	fail("white space within non-quoted parameter " bq name eq)	491	fail("white space within non-quoted parameter " bq name eq)
492	}	492	}
493	indefault {	493	indefault {
494	if (name in default)	494	if (name in conndefault)
495	fail("duplicated default parameter " bq name eq)	495	fail("duplicated default parameter " bq name eq)
496	default[name] = value	496	conndefault[name] = value
497	next	497	next
498	}	498	}
499	{	499	{
Lines 565-575 END { Link Here
565	if (!optional && !searching && unseen != "")	565	if (!optional && !searching && unseen != "")
566	fail("did not find " type " section(s) " bq substr(unseen, 2) eq)	566	fail("did not find " type " section(s) " bq substr(unseen, 2) eq)
567	if (!searching) {	567	if (!searching) {
568	for (name in default)	568	for (name in conndefault)
569	if (!(name in seen))	569	if (!(name in seen))
570	output(o_parm, name, default[name])	570	output(o_parm, name, conndefault[name])
571	} else {	571	} else {
572	if (default[search] in wanted)	572	if (conndefault[search] in wanted)
573	for (name in usesdefault)	573	for (name in usesdefault)
574	if (usesdefault[name])	574	if (usesdefault[name])
575	seen[name] = 1	575	seen[name] = 1

Lines 181-187 awk 'BEGIN { Link Here

(-)/usr/lib/ipsec/_confread.ORIG (-10 / +10 lines)
181	# if searching, seen is set of sectionnames which match	181	# if searching, seen is set of sectionnames which match
182	# if not searching, seen is set of parameter names found	182	# if not searching, seen is set of parameter names found
183	seen[""] = ""	183	seen[""] = ""
184	default[""] = ""	184	conndefault[""] = ""
185	usesdefault[""] = ""	185	usesdefault[""] = ""
186	orientation = 1	186	orientation = 1
187	}	187	}
Lines 286-293 function jam(sn, au) { Link Here
286	output(o_section, sn)	286	output(o_section, sn)
287		287
288	# do not accept anything from conn %default	288	# do not accept anything from conn %default
289	for (i in default)	289	for (i in conndefault)
290	delete default[i]	290	delete conndefault[i]
291		291
292	output(o_parm, orient("left"), "%defaultroute")	292	output(o_parm, orient("left"), "%defaultroute")
293	output(o_parm, orient("leftid"), "%myid")	293	output(o_parm, orient("leftid"), "%myid")
Lines 425-435 searching && $0 ~ searchpat { Link Here
425	if (!usesdefault[sectionname])	425	if (!usesdefault[sectionname])
426	fail("duplicated parameter " bq search eq)	426	fail("duplicated parameter " bq search eq)
427	usesdefault[sectionname] = 0	427	usesdefault[sectionname] = 0
428	} else if (search in default)	428	} else if (search in conndefault)
429	fail("duplicated parameter " bq search eq)	429	fail("duplicated parameter " bq search eq)
430	if (rest in wanted) { # a hit	430	if (rest in wanted) { # a hit
431	if (indefault)	431	if (indefault)
432	default[search] = rest	432	conndefault[search] = rest
433	else	433	else
434	searchfound(sectionname)	434	searchfound(sectionname)
435	} else {	435	} else {
Lines 491-499 $0 ~ /^(also\|alsoflip)=/ { Link Here
491	fail("white space within non-quoted parameter " bq name eq)	491	fail("white space within non-quoted parameter " bq name eq)
492	}	492	}
493	indefault {	493	indefault {
494	if (name in default)	494	if (name in conndefault)
495	fail("duplicated default parameter " bq name eq)	495	fail("duplicated default parameter " bq name eq)
496	default[name] = value	496	conndefault[name] = value
497	next	497	next
498	}	498	}
499	{	499	{
Lines 565-575 END { Link Here
565	if (!optional && !searching && unseen != "")	565	if (!optional && !searching && unseen != "")
566	fail("did not find " type " section(s) " bq substr(unseen, 2) eq)	566	fail("did not find " type " section(s) " bq substr(unseen, 2) eq)
567	if (!searching) {	567	if (!searching) {
568	for (name in default)	568	for (name in conndefault)
569	if (!(name in seen))	569	if (!(name in seen))
570	output(o_parm, name, default[name])	570	output(o_parm, name, conndefault[name])
571	} else {	571	} else {
572	if (default[search] in wanted)	572	if (conndefault[search] in wanted)
573	for (name in usesdefault)	573	for (name in usesdefault)
574	if (usesdefault[name])	574	if (usesdefault[name])
575	seen[name] = 1	575	seen[name] = 1

Lines 210-216 awk ' BEGIN { Link Here

(-)/usr/libexec/ipsec/manual.ORIG (-6 / +6 lines)
210	if ((k in s) && s[k] != "yes" && s[k] != "no")	210	if ((k in s) && s[k] != "yes" && s[k] != "no")
211	fail("parameter \"" k "\" must be \"yes\" or \"no\"")	211	fail("parameter \"" k "\" must be \"yes\" or \"no\"")
212	}	212	}
213	function default(k, v) {	213	function conndefault(k, v) {
214	if (!(k in s))	214	if (!(k in s))
215	s[k] = v	215	s[k] = v
216	}	216	}
Lines 323-329 awk ' BEGIN { Link Here
323	#########	323	#########
324	if (failed)	324	if (failed)
325	exit 1	325	exit 1
326	default("type", "tunnel")	326	conndefault("type", "tunnel")
327	type = s["type"]	327	type = s["type"]
328	shunt = 0	328	shunt = 0
329	if (type == "transport") {	329	if (type == "transport") {
Lines 364-372 awk ' BEGIN { Link Here
364	}	364	}
365		365
366	leftsub = ("leftsubnet" in s) ? 1 : 0	366	leftsub = ("leftsubnet" in s) ? 1 : 0
367	default("leftsubnet", s["left"] "/32")	367	conndefault("leftsubnet", s["left"] "/32")
368	rightsub = ("rightsubnet" in s) ? 1 : 0	368	rightsub = ("rightsubnet" in s) ? 1 : 0
369	default("rightsubnet", s["right"] "/32")	369	conndefault("rightsubnet", s["right"] "/32")
370	integer("espreplay_window")	370	integer("espreplay_window")
371	if (("espreplay_window" in s) && s["espreplay_window"] == 0)	371	if (("espreplay_window" in s) && s["espreplay_window"] == 0)
372	delete s["espreplay_window"]	372	delete s["espreplay_window"]
Lines 376-383 awk ' BEGIN { Link Here
376	netfix("left")	376	netfix("left")
377	netfix("right")	377	netfix("right")
378		378
379	default("leftnexthop", s["right"])	379	conndefault("leftnexthop", s["right"])
380	default("rightnexthop", s["left"])	380	conndefault("rightnexthop", s["left"])
381	if (s["leftnexthop"] == s["left"])	381	if (s["leftnexthop"] == s["left"])
382	fail("left and leftnexthop must not be the same")	382	fail("left and leftnexthop must not be the same")
383	if (s["rightnexthop"] == s["right"])	383	if (s["rightnexthop"] == s["right"])