From nobody@FreeBSD.org  Fri Sep  7 21:39:06 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A9B2716A421
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  7 Sep 2007 21:39:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 906EA13C457
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  7 Sep 2007 21:39:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l87Ld6Ln075821
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 7 Sep 2007 21:39:06 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l87Ld6jP075820;
	Fri, 7 Sep 2007 21:39:06 GMT
	(envelope-from nobody)
Message-Id: <200709072139.l87Ld6jP075820@www.freebsd.org>
Date: Fri, 7 Sep 2007 21:39:06 GMT
From: Artem Naluzhnyy <tut@nhamon.com.ua>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] add syslog support for wpa_supplicant
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         116190
>Category:       bin
>Synopsis:       [patch] add syslog support for wpa_supplicant
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 07 21:40:02 GMT 2007
>Closed-Date:    Mon Apr 28 16:22:31 UTC 2008
>Last-Modified:  Mon Apr 28 16:22:31 UTC 2008
>Originator:     Artem Naluzhnyy
>Release:        7.0-CURRENT
>Organization:
>Environment:
FreeBSD tut.at.home 7.0-CURRENT FreeBSD 7.0-CURRENT #4: Tue Sep  4 18:10:44 EEST 2007     root@tut.at.home:/usr/obj/usr/src/sys/TUT  i386
>Description:
What about syslog capability for wpa_supplicant? See the patch attached.


We also have to remove '-q' option from appropriate rc.d/wpa_supplicant script to set wpa_supplicant debug level back to normal:

#------------------------------------------------------------
--- wpa_supplicant.orig	2005-10-20 01:26:47.000000000 +0300
+++ wpa_supplicant	2007-09-07 22:27:04.000000000 +0300
@@ -32,7 +32,7 @@
 load_rc_config $name
 
 pid_file="/var/run/${name}/${ifn}.pid"
-command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file"
+command_args="-B -i $ifn -c $conf_file -D $driver -P $pid_file"
 required_files=$conf_file
 
 run_rc_command "$1"
#------------------------------------------------------------


Here is an example of /var/log/messages for the default wpa_supplicant debug level:

Sep  6 02:57:38 tut wpa_supplicant[86187]: Trying to associate with 00:19:5b:da:aa:fc (SSID='Blackhole' freq=2457 MHz)
Sep  6 02:57:38 tut kernel: ath0: link state changed to UP
Sep  6 02:57:38 tut wpa_supplicant[86187]: Associated with 00:19:5b:da:aa:fc
Sep  6 02:57:38 tut wpa_supplicant[86187]: WPA: Key negotiation completed with 00:19:5b:da:aa:fc [PTK=CCMP GTK=TKIP]
Sep  6 02:57:38 tut wpa_supplicant[86187]: CTRL-EVENT-CONNECTED - Connection to 00:19:5b:da:aa:fc completed (auth) [id=0 id_str=]
Sep  6 02:57:45 tut dhclient: New IP Address (ath0): 192.168.0.180
Sep  6 02:57:45 tut dhclient: New Subnet Mask (ath0): 255.255.255.0
Sep  6 02:57:45 tut dhclient: New Broadcast Address (ath0): 192.168.0.255
Sep  6 02:57:45 tut dhclient: New Routers (ath0): 192.168.0.1
..
Sep  6 02:57:53 tut kernel: ath0: link state changed to DOWN
Sep  6 02:57:53 tut wpa_supplicant[86187]: CTRL-EVENT-TERMINATING - signal 2 received
Sep  6 02:57:53 tut dhclient[86212]: connection closed
Sep  6 02:57:53 tut dhclient[86212]: exiting.

>How-To-Repeat:

>Fix:
--- common.c.orig	2007-08-28 02:35:47.000000000 +0300
+++ common.c	2007-09-07 21:55:03.000000000 +0300
@@ -16,6 +16,7 @@
 
 #include "common.h"
 
+#include <syslog.h>
 
 #ifdef CONFIG_DEBUG_FILE
 static FILE *out_file = NULL;
@@ -177,6 +178,7 @@
 void wpa_printf(int level, char *fmt, ...)
 {
 	va_list ap;
+	int syslog_priority;
 
 	va_start(ap, fmt);
 	if (level >= wpa_debug_level) {
@@ -192,6 +194,25 @@
 #ifdef CONFIG_DEBUG_FILE
 		}
 #endif /* CONFIG_DEBUG_FILE */
+		
+		switch(level) {
+			case MSG_MSGDUMP:
+			case MSG_DEBUG:
+				syslog_priority = LOG_DEBUG;
+				break;
+			case MSG_INFO:
+				syslog_priority = LOG_NOTICE;
+				break;
+			case MSG_WARNING:
+				syslog_priority = LOG_WARNING;
+				break;
+			case MSG_ERROR:
+				syslog_priority = LOG_ERR;
+				break;
+			default:
+				syslog_priority = LOG_INFO;
+		}
+		vsyslog(syslog_priority, fmt, ap);
 	}
 	va_end(ap);
 }
--- wpa_supplicant.c.orig	2007-08-28 02:35:56.000000000 +0300
+++ wpa_supplicant.c	2007-09-07 21:32:09.000000000 +0300
@@ -38,6 +38,8 @@
 #include "wpa_ctrl.h"
 #include "mlme.h"
 
+#include <syslog.h>
+
 const char *wpa_supplicant_version =
 "wpa_supplicant v" VERSION_STR "\n"
 "Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi> and contributors";
@@ -2484,6 +2486,8 @@
 	wpa_debug_use_file = params->wpa_debug_use_file;
 	wpa_debug_open_file();
 
+	openlog("wpa_supplicant", LOG_PID | LOG_NDELAY, LOG_DAEMON);
+
 	ret = eap_peer_register_methods();
 	if (ret) {
 		wpa_printf(MSG_ERROR, "Failed to register EAP methods");
@@ -2609,5 +2613,6 @@
 	os_free(global->params.ctrl_interface);
 
 	os_free(global);
+	closelog();
 	wpa_debug_close_file();
 }


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->sam 
Responsible-Changed-By: remko 
Responsible-Changed-When: Fri Sep 7 21:44:38 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116190 
State-Changed-From-To: open->feedback 
State-Changed-By: sam 
State-Changed-When: Mon Oct 15 18:52:54 UTC 2007 
State-Changed-Why:  
let me check upstream in case it's already been done (was surprised it 
wasn't in wpa_supplicant; hostapd definitely can log to syslog); it seems 
like a fine thing to add 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116190 

From: "Artem Naluzhnyy" <tut@nhamon.com.ua>
To: "sam@freebsd.org" <sam@freebsd.org>, bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/116190: [patch] add syslog support for wpa_supplicant
Date: Mon, 15 Oct 2007 22:06:33 +0300

 ------=_Part_11102_9491976.1192475193057
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 2007/10/15, sam@freebsd.org <sam@freebsd.org>:
 
 > let me check upstream in case it's already been done (was surprised it
 > wasn't in wpa_supplicant; hostapd definitely can log to syslog); it seems
 > like a fine thing to add
 
 Afaik wpa_supplicant has can not log to syslog (I saw similar feature
 request in a mail list, but it was not satisfied).
 
 Here is an updated patch attached (set also LOG_CONS flag to monitor
 wpa_supplicant activity on startup when syslogd is not started).
 
 -- 
 /tut
 
 ------=_Part_11102_9491976.1192475193057
 Content-Type: text/plain; name="wpa_supplicant-syslog.diff.txt"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="wpa_supplicant-syslog.diff.txt";
  filename="wpa_supplicant-syslog.diff.txt"
 X-Attachment-Id: f_f7tcuj76
 
 LS0tIHNyYy9ldGMvcmMuZC93cGFfc3VwcGxpY2FudC5vcmlnCTIwMDUtMTAtMjAgMDE6MjY6NDcu
 MDAwMDAwMDAwICswMzAwCisrKyBzcmMvZXRjL3JjLmQvd3BhX3N1cHBsaWNhbnQJMjAwNy0wOS0w
 NyAyMjoyNzowNC4wMDAwMDAwMDAgKzAzMDAKQEAgLTMyLDcgKzMyLDcgQEAKIGxvYWRfcmNfY29u
 ZmlnICRuYW1lCiAKIHBpZF9maWxlPSIvdmFyL3J1bi8ke25hbWV9LyR7aWZufS5waWQiCi1jb21t
 YW5kX2FyZ3M9Ii1CIC1xIC1pICRpZm4gLWMgJGNvbmZfZmlsZSAtRCAkZHJpdmVyIC1QICRwaWRf
 ZmlsZSIKK2NvbW1hbmRfYXJncz0iLUIgLWkgJGlmbiAtYyAkY29uZl9maWxlIC1EICRkcml2ZXIg
 LVAgJHBpZF9maWxlIgogcmVxdWlyZWRfZmlsZXM9JGNvbmZfZmlsZQogCiBydW5fcmNfY29tbWFu
 ZCAiJDEiCi0tLSBzcmMvY29udHJpYi93cGFfc3VwcGxpY2FudC9jb21tb24uYy5vcmlnCTIwMDct
 MDgtMjggMDI6MzU6NDcuMDAwMDAwMDAwICswMzAwCisrKyBzcmMvY29udHJpYi93cGFfc3VwcGxp
 Y2FudC9jb21tb24uYwkyMDA3LTA5LTA3IDIxOjU1OjAzLjAwMDAwMDAwMCArMDMwMApAQCAtMTYs
 NiArMTYsNyBAQAogCiAjaW5jbHVkZSAiY29tbW9uLmgiCiAKKyNpbmNsdWRlIDxzeXNsb2cuaD4K
 IAogI2lmZGVmIENPTkZJR19ERUJVR19GSUxFCiBzdGF0aWMgRklMRSAqb3V0X2ZpbGUgPSBOVUxM
 OwpAQCAtMTc3LDYgKzE3OCw3IEBACiB2b2lkIHdwYV9wcmludGYoaW50IGxldmVsLCBjaGFyICpm
 bXQsIC4uLikKIHsKIAl2YV9saXN0IGFwOworCWludCBzeXNsb2dfcHJpb3JpdHk7CiAKIAl2YV9z
 dGFydChhcCwgZm10KTsKIAlpZiAobGV2ZWwgPj0gd3BhX2RlYnVnX2xldmVsKSB7CkBAIC0xOTIs
 NiArMTk0LDI1IEBACiAjaWZkZWYgQ09ORklHX0RFQlVHX0ZJTEUKIAkJfQogI2VuZGlmIC8qIENP
 TkZJR19ERUJVR19GSUxFICovCisJCQorCQlzd2l0Y2gobGV2ZWwpIHsKKwkJCWNhc2UgTVNHX01T
 R0RVTVA6CisJCQljYXNlIE1TR19ERUJVRzoKKwkJCQlzeXNsb2dfcHJpb3JpdHkgPSBMT0dfREVC
 VUc7CisJCQkJYnJlYWs7CisJCQljYXNlIE1TR19JTkZPOgorCQkJCXN5c2xvZ19wcmlvcml0eSA9
 IExPR19OT1RJQ0U7CisJCQkJYnJlYWs7CisJCQljYXNlIE1TR19XQVJOSU5HOgorCQkJCXN5c2xv
 Z19wcmlvcml0eSA9IExPR19XQVJOSU5HOworCQkJCWJyZWFrOworCQkJY2FzZSBNU0dfRVJST1I6
 CisJCQkJc3lzbG9nX3ByaW9yaXR5ID0gTE9HX0VSUjsKKwkJCQlicmVhazsKKwkJCWRlZmF1bHQ6
 CisJCQkJc3lzbG9nX3ByaW9yaXR5ID0gTE9HX0lORk87CisJCX0KKwkJdnN5c2xvZyhzeXNsb2df
 cHJpb3JpdHksIGZtdCwgYXApOwogCX0KIAl2YV9lbmQoYXApOwogfQotLS0gc3JjL2NvbnRyaWIv
 d3BhX3N1cHBsaWNhbnQvd3BhX3N1cHBsaWNhbnQuYy5vcmlnCTIwMDctMDgtMjggMDI6MzU6NTYu
 MDAwMDAwMDAwICswMzAwCisrKyBzcmMvY29udHJpYi93cGFfc3VwcGxpY2FudC93cGFfc3VwcGxp
 Y2FudC5jCTIwMDctMDktMDcgMjE6MzI6MDkuMDAwMDAwMDAwICswMzAwCkBAIC0zOCw2ICszOCw4
 IEBACiAjaW5jbHVkZSAid3BhX2N0cmwuaCIKICNpbmNsdWRlICJtbG1lLmgiCiAKKyNpbmNsdWRl
 IDxzeXNsb2cuaD4KKwogY29uc3QgY2hhciAqd3BhX3N1cHBsaWNhbnRfdmVyc2lvbiA9CiAid3Bh
 X3N1cHBsaWNhbnQgdiIgVkVSU0lPTl9TVFIgIlxuIgogIkNvcHlyaWdodCAoYykgMjAwMy0yMDA3
 LCBKb3VuaSBNYWxpbmVuIDxqQHcxLmZpPiBhbmQgY29udHJpYnV0b3JzIjsKQEAgLTI0ODQsNiAr
 MjQ4Niw4IEBACiAJd3BhX2RlYnVnX3VzZV9maWxlID0gcGFyYW1zLT53cGFfZGVidWdfdXNlX2Zp
 bGU7CiAJd3BhX2RlYnVnX29wZW5fZmlsZSgpOwogCisJb3BlbmxvZygid3BhX3N1cHBsaWNhbnQi
 LCBMT0dfUElEIHwgTE9HX05ERUxBWSB8IExPR19DT05TLCBMT0dfREFFTU9OKTsKKwogCXJldCA9
 IGVhcF9wZWVyX3JlZ2lzdGVyX21ldGhvZHMoKTsKIAlpZiAocmV0KSB7CiAJCXdwYV9wcmludGYo
 TVNHX0VSUk9SLCAiRmFpbGVkIHRvIHJlZ2lzdGVyIEVBUCBtZXRob2RzIik7CkBAIC0yNjA5LDUg
 KzI2MTMsNiBAQAogCW9zX2ZyZWUoZ2xvYmFsLT5wYXJhbXMuY3RybF9pbnRlcmZhY2UpOwogCiAJ
 b3NfZnJlZShnbG9iYWwpOworCWNsb3NlbG9nKCk7CiAJd3BhX2RlYnVnX2Nsb3NlX2ZpbGUoKTsK
 IH0KIA==
 ------=_Part_11102_9491976.1192475193057--

From: "Artem Naluzhnyy" <tut@nhamon.com.ua>
To: "sam@freebsd.org" <sam@freebsd.org>, bug-followup@freebsd.org
Cc:  
Subject: Re: bin/116190: [patch] add syslog support for wpa_supplicant
Date: Wed, 6 Feb 2008 16:41:23 +0200

 Hi,
 
 Th PR is still in 'feedback' state. Do you expect some info from my side?
 
 -- 
 Artem Naluzhnyy

From: Sam Leffler <sam@errno.com>
To: Artem Naluzhnyy <tut@nhamon.com.ua>
Cc: bug-followup@freebsd.org
Subject: Re: bin/116190: [patch] add syslog support for wpa_supplicant
Date: Fri, 08 Feb 2008 14:02:34 -0800

 Artem Naluzhnyy wrote:
 > Hi,
 >
 > Th PR is still in 'feedback' state. Do you expect some info from my side?
 >
 >   
 No, I've been waiting for 7.0 to release and to have time to deal w/ a 
 variety of wpa_supplicant and hostapd issues.
 
     Sam
 

From: Sam Leffler <sam@freebsd.org>
To: Artem Naluzhnyy <tut@nhamon.com.ua>
Cc: bug-followup@freebsd.org
Subject: Re: bin/116190: [patch] add syslog support for wpa_supplicant
Date: Thu, 13 Mar 2008 16:02:49 -0700

 Sam Leffler wrote:
 > Artem Naluzhnyy wrote:
 >> Hi,
 >>
 >> Th PR is still in 'feedback' state. Do you expect some info from my 
 >> side?
 >>
 >>   
 > No, I've been waiting for 7.0 to release and to have time to deal w/ a 
 > variety of wpa_supplicant and hostapd issues.
 >
 
 I have tentative changes to implement this that I've submitted upstream 
 for review.  Once I hear back I'll work to get them into CVS.
 
     Sam
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/116190: commit references a PR
Date: Mon, 24 Mar 2008 20:13:46 +0000 (UTC)

 sam         2008-03-24 20:13:41 UTC
 
   FreeBSD src repository
 
   Modified files:        (Branch: MALINEN)
     contrib/wpa_supplicant Makefile common.c defconfig main.c 
                            wpa_supplicant.c wpa_supplicant_i.h 
   Log:
   add syslog support (committed on vendor branch as it's been sent upstream)
   
   PR:             bin/116190
   
   Revision  Changes    Path
   1.1.1.5   +4 -0      src/contrib/wpa_supplicant/Makefile
   1.1.1.5   +47 -0     src/contrib/wpa_supplicant/common.c
   1.1.1.5   +3 -0      src/contrib/wpa_supplicant/defconfig
   1.1.1.4   +10 -2     src/contrib/wpa_supplicant/main.c
   1.1.1.7   +3 -0      src/contrib/wpa_supplicant/wpa_supplicant.c
   1.1.1.6   +5 -0      src/contrib/wpa_supplicant/wpa_supplicant_i.h
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: sam 
State-Changed-When: Mon Apr 28 16:22:03 UTC 2008 
State-Changed-Why:  
support was added to head as part of the vap merge 

http://www.freebsd.org/cgi/query-pr.cgi?pr=116190 
>Unformatted:
