# HG changeset patch
# User Sebastien Decugis <sdecugis@freediameter.net>
# Date 1367481993 -28800
# Node ID 765134772e47df2f9f2bc2b07c6bc86d762aabc7
# Parent  ab47e231afee408519e2aab8a2e8309ec632350c
Replace macros with functions for dumping sockaddr structures

diff -r ab47e231afee -r 765134772e47 libfdproto/CMakeLists.txt
--- a/libfdproto/CMakeLists.txt	Thu May 02 16:05:35 2013 +0800
+++ b/libfdproto/CMakeLists.txt	Thu May 02 16:06:33 2013 +0800
@@ -16,6 +16,7 @@
 	portability.c
 	rt_data.c
 	sessions.c
+	utils.c
 	)
 
 # Save the list of files for testcases in the core's directory
diff -r ab47e231afee -r 765134772e47 libfdproto/utils.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libfdproto/utils.c	Thu May 02 16:06:33 2013 +0800
@@ -0,0 +1,67 @@
+/*********************************************************************************************************
+* Software License Agreement (BSD License)                                                               *
+* Author: Sebastien Decugis <sdecugis@freediameter.net>							 *
+*													 *
+* Copyright (c) 2013, WIDE Project and NICT								 *
+* All rights reserved.											 *
+* 													 *
+* Redistribution and use of this software in source and binary forms, with or without modification, are  *
+* permitted provided that the following conditions are met:						 *
+* 													 *
+* * Redistributions of source code must retain the above 						 *
+*   copyright notice, this list of conditions and the 							 *
+*   following disclaimer.										 *
+*    													 *
+* * Redistributions in binary form must reproduce the above 						 *
+*   copyright notice, this list of conditions and the 							 *
+*   following disclaimer in the documentation and/or other						 *
+*   materials provided with the distribution.								 *
+* 													 *
+* * Neither the name of the WIDE Project or NICT nor the 						 *
+*   names of its contributors may be used to endorse or 						 *
+*   promote products derived from this software without 						 *
+*   specific prior written permission of WIDE Project and 						 *
+*   NICT.												 *
+* 													 *
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
+* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 	 *
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 	 *
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
+* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   *
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.								 *
+*********************************************************************************************************/
+
+#include "fdproto-internal.h"
+
+char * fd_sa_dump_node(char * buf, size_t bufsize, sSA * sa, int flags) 
+{
+	char addrbuf[INET6_ADDRSTRLEN];
+	if (sa) {
+		int rc = getnameinfo(sa, sSAlen( sa ), addrbuf, sizeof(addrbuf), NULL, 0, flags);
+		if (rc)
+			snprintf(buf, bufsize, "%s", gai_strerror(rc));
+		else
+			snprintf(buf, bufsize, "%s", &__addrbuf[0]);
+	} else {
+		snprintf(buf, bufsize, "(NULL / ANY)");
+	}
+	return buf;
+}
+
+char * fd_sa_dump_node_serv(char * buf, size_t bufsize, sSA * sa, int flags) 
+{
+	char addrbuf[INET6_ADDRSTRLEN];
+	char servbuf[32];
+	if (sa) {
+		int rc = getnameinfo(sa, sSAlen( sa ), addrbuf, sizeof(addrbuf), servbuf, sizeof(servbuf), flags);
+		if (rc)
+			snprintf(buf, bufsize, "%s", gai_strerror(rc));
+		else
+			snprintf(buf, bufsize, "%s", &__addrbuf[0]);
+	} else {
+		snprintf(buf, bufsize, "(NULL / ANY)");
+	}
+	return buf;
+}