commit c54710dee0708911e2a17225fa41d8642c3ff72c
author Jouni Malinen <jouni@codeaurora.org> Wed Jan 23 12:34:21 2019 +0200
committer Jouni Malinen <jouni@codeaurora.org> Wed Jan 23 12:34:44 2019 +0200
tree 15a70940ac032ece3e2384f06cf297a71a68c74d
parent df866471472af20342c989514ce1958875cb4ec8

server_get_info: Report hs20_spp_server version

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

basic.c

diff --git a/basic.c b/basic.c
index 37949e9..d6df83d 100644
--- a/basic.c
+++ b/basic.c
@@ -44,7 +44,7 @@
 }
 
 
-static void get_ver(const char *cmd, char *buf, size_t buflen)
+void get_ver(const char *cmd, char *buf, size_t buflen)
 {
 	FILE *f;
 	char *pos;

server.c

diff --git a/server.c b/server.c
index 9772b90..0d2a897 100644
--- a/server.c
+++ b/server.c
@@ -9,12 +9,16 @@
 #include "sigma_dut.h"
 #include <sqlite3.h>
 
+#ifndef ROOT_DIR
+#define ROOT_DIR "/home/user/hs20-server"
+#endif /* ROOT_DIR */
+
 #ifndef SERVER_DB
-#define SERVER_DB "/home/user/hs20-server/AS/DB/eap_user.db"
+#define SERVER_DB ROOT_DIR "/AS/DB/eap_user.db"
 #endif /* SERVER_DB */
 
 #ifndef CERT_DIR
-#define CERT_DIR "/home/user/hs20-server/certs"
+#define CERT_DIR ROOT_DIR "/certs"
 #endif /* CERT_DIR */
 
 
@@ -31,7 +35,12 @@
 			       struct sigma_conn *conn,
 			       struct sigma_cmd *cmd)
 {
-	send_resp(dut, conn, SIGMA_COMPLETE, "vendor,OSU,model,OS,version,1.0");
+	char ver[128], resp[256];
+
+	get_ver(ROOT_DIR "/spp/hs20_spp_server -v", ver, sizeof(ver));
+
+	snprintf(resp, sizeof(resp), "vendor,OSU,model,OS,version,%s", ver);
+	send_resp(dut, conn, SIGMA_COMPLETE, resp);
 	return 0;
 }
 

sigma_dut.h

diff --git a/sigma_dut.h b/sigma_dut.h
index 5fbacd4..ab6c889 100644
--- a/sigma_dut.h
+++ b/sigma_dut.h
@@ -880,6 +880,9 @@
 int p2p_discover_peer(struct sigma_dut *dut, const char *ifname,
 		      const char *peer, int full);
 
+/* basic.c */
+void get_ver(const char *cmd, char *buf, size_t buflen);
+
 /* utils.c */
 enum sigma_program sigma_program_to_enum(const char *prog);
 int parse_hexstr(const char *hex, unsigned char *buf, size_t buflen);