[PATCH 2/5] make-secnet-sites: Fix userv invocation after pfilepath

Richard Kettlewell rjk at terraraq.org.uk
Sun Jul 1 17:12:31 BST 2012


I don't seem to have time to do the full set of outstanding patches 
justice, but I did notice a couple of trivial things:

On 17/12/2011 22:03, Ian Jackson wrote:
> The commit 9b8369e07aeba5ed2c69fb4a7f74d07c8cebe015
>   make-secnet-sites: refactor to break out new function "pfilepath"
> broke the userv service invocation, because it turned out that later
> code depended on the "headerlines" variable whose assignment had been
> removed and replaced by a call to pfilepath.
>
> Make pfilepath return the lines read from the file and assign the
> result to headerlines.
>
> Signed-off-by: Ian Jackson <ijackson at chiark.greenend.org.uk>
[...]
 > +		headerinput=pfilepath(header,allow_include=True)

The description seems to be slightly inaccurate - 'headerinput' rather 
than 'headerlines'.

On 17/12/2011 22:03, Ian Jackson wrote:
 > -#define LINK_QUALITY_DOWN 0   /* No chance of a packet being 
delivered */
 > -#define LINK_QUALITY_DOWN_STALE_ADDRESS 1 /* Link down, old address 
information */
 > -#define LINK_QUALITY_DOWN_CURRENT_ADDRESS 2 /* Link down, current 
address information */
 > -#define LINK_QUALITY_UP 3     /* Link active */
 > +#define LINK_QUALITY_UNUSED 0   /* This link is unused, do not make 
this netlink */
 > +#define LINK_QUALITY_DOWN 1   /* No chance of a packet being 
delivered right away*/
 > +#define LINK_QUALITY_DOWN_STALE_ADDRESS 2 /* Link down, old address 
information */
 > +#define LINK_QUALITY_DOWN_CURRENT_ADDRESS 3 /* Link down, current 
address information */
 > +#define LINK_QUALITY_UP 4     /* Link active */

Perhaps this should be an enum.

ttfn/rjk



More information about the sgo-software-discuss mailing list