changeset 553:153cd2600fcf

Fix another issue
author Sebastien Decugis <sdecugis@nict.go.jp>
date Wed, 15 Sep 2010 14:52:24 +0900
parents d2be88628747
children 25440e53a48e
files extensions/app_radgw/radius.c extensions/app_radgw/rgw.h extensions/app_radgw/rgw_clients.c extensions/app_radgw/rgw_servers.c
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/app_radgw/radius.c	Wed Sep 15 14:45:55 2010 +0900
+++ b/extensions/app_radgw/radius.c	Wed Sep 15 14:52:24 2010 +0900
@@ -309,8 +309,8 @@
 	}
 }
 
-/* Dump a message  -- can be used safely with a struct radius_msg as parameter (we don't dump the metadata) */
-void rgw_msg_dump(struct rgw_radius_msg_meta * msg)
+/* Dump a message  */
+void rgw_msg_dump(struct rgw_radius_msg_meta * msg, int has_meta)
 {
 	unsigned char *auth;
 	size_t i;
@@ -330,7 +330,7 @@
 		fd_log_debug("    - Type: 0x%02hhx (%s)\n       Len: %-3hhu", attr->type, rgw_msg_attrtype_str(attr->type), attr->length);
 		radius_msg_dump_attr_val(attr);
 	}
-	if (msg->ps_nb) {
+	if (has_meta && msg->ps_nb) {
 		fd_log_debug("---- hidden attributes:\n");
 		for (i = msg->ps_first; i < msg->ps_first + msg->ps_nb; i++) {
 			struct radius_attr_hdr *attr = (struct radius_attr_hdr *)(msg->radius.buf + msg->radius.attr_pos[i]);
--- a/extensions/app_radgw/rgw.h	Wed Sep 15 14:45:55 2010 +0900
+++ b/extensions/app_radgw/rgw.h	Wed Sep 15 14:52:24 2010 +0900
@@ -65,7 +65,7 @@
 };
 void rgw_msg_free(struct rgw_radius_msg_meta ** msg);
 int rgw_msg_parse(unsigned char * buf, size_t len, struct rgw_radius_msg_meta ** msg);
-void rgw_msg_dump(struct rgw_radius_msg_meta * msg);
+void rgw_msg_dump(struct rgw_radius_msg_meta * msg, int has_meta);
 
 /* Local RADIUS server(s) configuration */
 struct rgw_serv {
--- a/extensions/app_radgw/rgw_clients.c	Wed Sep 15 14:45:55 2010 +0900
+++ b/extensions/app_radgw/rgw_clients.c	Wed Sep 15 14:52:24 2010 +0900
@@ -998,7 +998,7 @@
 	
 	/* Debug */
 	TRACE_DEBUG(FULL, "RADIUS message ready for sending:");
-	rgw_msg_dump((struct rgw_radius_msg_meta *)*msg);
+	rgw_msg_dump((struct rgw_radius_msg_meta *)*msg, 0);
 
 	/* Send the message */
 	CHECK_FCT( rgw_servers_send(req->serv_type, (*msg)->buf, (*msg)->buf_used, cli->sa, req->port) );
--- a/extensions/app_radgw/rgw_servers.c	Wed Sep 15 14:45:55 2010 +0900
+++ b/extensions/app_radgw/rgw_servers.c	Wed Sep 15 14:52:24 2010 +0900
@@ -157,7 +157,7 @@
 		msg->serv_type = me->type;
 		msg->port = port;
 		
-		rgw_msg_dump(msg);
+		rgw_msg_dump(msg, 1);
 		
 		/* queue the message for a worker thread */
 		CHECK_FCT_DO( rgw_work_add(msg, nas_info), break );
"Welcome to our mercurial repository"