Merge commit '6f798683a34aa87f5e4f590be4c90253a1135e08' into wireguard-next-tmp7-1

5 files changed, 8 insertions, 7 deletions

diff --git a/conf/conf.h b/conf/conf.h
index f91d7039..b7c97ce5 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -77,6 +77,7 @@ int config_status(void);
 btime config_timer_status(void);
 void config_init(void);
 void cf_error(const char *msg, ...) NORET;
+#define cf_warn(msg, args...)  log(L_WARN "%s:%d:%d: " msg, ifs->file_name, ifs->lino, ifs->chno - ifs->toklen + 1, ##args)
 void config_add_obstacle(struct config *);
 void config_del_obstacle(struct config *);
 void order_shutdown(int gr);
diff --git a/proto/bfd/config.Y b/proto/bfd/config.Y
index 70461872..d9a154b2 100644
--- a/proto/bfd/config.Y
+++ b/proto/bfd/config.Y
@@ -95,7 +95,7 @@ bfd_iface_finish:
   BFD_IFACE->passwords = get_passwords();
 
   if (!BFD_IFACE->auth_type != !BFD_IFACE->passwords)
-    log(L_WARN "Authentication and password options should be used together");
+    cf_warn("Authentication and password options should be used together");
 
   if (BFD_IFACE->passwords)
   {
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index f7949b63..7311a160 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -175,7 +175,7 @@ bgp_proto:
  | bgp_proto DEFAULT BGP_MED expr ';' { BGP_CFG->default_med = $4; }
  | bgp_proto DEFAULT BGP_LOCAL_PREF expr ';' { BGP_CFG->default_local_pref = $4; }
  | bgp_proto SOURCE ADDRESS ipa ';' { BGP_CFG->local_ip = $4; }
- | bgp_proto START DELAY TIME expr ';' { BGP_CFG->connect_delay_time = $5; log(L_WARN "%s: Start delay time option is deprecated, use connect delay time", this_proto->name); }
+ | bgp_proto START DELAY TIME expr ';' { BGP_CFG->connect_delay_time = $5; cf_warn("%s: Start delay time option is deprecated, use connect delay time", this_proto->name); }
  | bgp_proto CONNECT DELAY TIME expr ';' { BGP_CFG->connect_delay_time = $5; }
  | bgp_proto CONNECT RETRY TIME expr ';' { BGP_CFG->connect_retry_time = $5; }
  | bgp_proto KEEPALIVE TIME expr ';' { BGP_CFG->keepalive_time = $4; if (($4<1) || ($4>65535)) cf_error("Keepalive time must be in range 1-65535"); }
@@ -268,7 +268,7 @@ bgp_channel_item:
  | NEXT HOP KEEP bgp_nh { BGP_CC->next_hop_keep = $4; }
  | NEXT HOP PREFER GLOBAL { BGP_CC->next_hop_prefer = NHP_GLOBAL; }
  | MANDATORY bool { BGP_CC->mandatory = $2; }
- | MISSING LLADDR bgp_lladdr { log(L_WARN "%s.%s: Missing lladdr option is deprecated and ignored, remove it", this_proto->name, this_channel->name); }
+ | MISSING LLADDR bgp_lladdr { cf_warn("%s.%s: Missing lladdr option is deprecated and ignored, remove it", this_proto->name, this_channel->name); }
  | GATEWAY DIRECT { BGP_CC->gw_mode = GW_DIRECT; }
  | GATEWAY RECURSIVE { BGP_CC->gw_mode = GW_RECURSIVE; }
  | SECONDARY bool { BGP_CC->secondary = $2; }
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index cfde3a5d..71d9d05b 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -38,10 +38,10 @@ ospf_iface_finish(void)
   ip->passwords = get_passwords();
 
   if (ospf_cfg_is_v2() && (ip->autype == OSPF_AUTH_CRYPT) && (ip->helloint < 5))
-    log(L_WARN "Hello or poll interval less that 5 makes cryptographic authenication prone to replay attacks");
+    cf_warn("Hello or poll interval less that 5 makes cryptographic authenication prone to replay attacks");
 
   if ((ip->autype == OSPF_AUTH_NONE) && (ip->passwords != NULL))
-    log(L_WARN "Password option without authentication option does not make sense");
+    cf_warn("Password option without authentication option does not make sense");
 
   if (ip->passwords)
   {
@@ -119,7 +119,7 @@ ospf_proto_finish(void)
 	  if (!ic->instance_id_set)
 	    ic->instance_id = base;
 	  else if (ic->instance_id >= 128)
-	    log(L_WARN "Instance ID %d from unassigned/private range", ic->instance_id);
+	    cf_warn("Instance ID %d from unassigned/private range", ic->instance_id);
 	  else if ((ic->instance_id < base) || (ic->instance_id >= (base + 32)))
 	    cf_error("Instance ID %d invalid for given channel type", ic->instance_id);
 	}
diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index 1fab4527..44f2742c 100644
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -117,7 +117,7 @@ rip_iface_finish:
   RIP_IFACE->passwords = get_passwords();
 
   if (!RIP_IFACE->auth_type != !RIP_IFACE->passwords)
-    log(L_WARN "Authentication and password options should be used together");
+    cf_warn("Authentication and password options should be used together");
 
   if (RIP_IFACE->passwords)
   {