Merge branch 'develop'

Conflicts:
	README.md

Resolution:
	An extra blank newline from develop. Removed - Nitin

Author: nitinkgupta

.gitignore

@@ -9,7 +9,8 @@
 core
 *~
 *.sw?
-!/visualizations/local_click/Visualizer.swf
+!/tools/visualizations/local_click/Visualizer.swf
+!/tools/visualizations/distributed_click/Visualizer.swf
 tags
 cscope.out
 *.o.cmd

api/dagaddr/cpp/dagaddr.cpp

@@ -18,19 +18,65 @@
  @file dagaddr.cpp
  @brief Implements dagaddr library
 */
+
+
 #include "dagaddr.hpp"
 #include "utils.hpp"
 #include <cstring>
-#include <cstdio>
 #include <map>
 #include <algorithm>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-
 static const std::size_t vector_find_npos = std::size_t(-1);
 
+/*
+ * load user defined XIDs for use in parsing and unparsing DAGs
+ */
+Node::XidMap Node::load_xids()
+{
+	Node::XidMap ids;
+
+	char path[PATH_SIZE];
+	char name[256], text[256];
+	short id;
+	unsigned len = sizeof(path);
+	char *p;
+
+	if ((p = getenv("XIADIR")) != NULL) {
+		strncpy(path, p, len);
+	} else if (!getcwd(path, len)) {
+		path[0] = 0;
+	}
+
+	p = strstr(path, SOURCE_DIR);
+	if (p) {
+		p += sizeof(SOURCE_DIR) - 1;
+		*p = '\0';
+	}
+	strncat(path, "/etc/xids", len);
+
+	FILE *f = fopen(path, "r");
+	if (f) {
+		while (!feof(f)) {
+			if (fgets(text, sizeof(text), f)) {
+ 				if (sscanf(text, "%hi %s", &id, name) == 2) {
+					ids[id] = name;
+				}
+			}
+		}
+		fclose(f);
+	}
+
+	return ids;
+}
+
+// call the load_xids function at init time to fill in the hash map
+Node::XidMap Node::xids = Node::load_xids();
+
+
+
 template <typename T>
 static std::size_t
 vector_find(std::vector<T>& v, const T& e)
@@ -232,8 +278,23 @@ Node::construct_from_strings(const std::string type_str, const std::string id_st
 		ptr_->type = XID_TYPE_DUMMY_SOURCE;
 	else
 	{
-		ptr_->type = 0;
-		printf("WARNING: Unrecognized XID type: %s\n", type_str.c_str());
+		// see if it's a user defined XID
+		XidMap::const_iterator itr;
+		int found = 0;
+
+		for (itr = Node::xids.begin(); itr != Node::xids.end(); itr++) {
+
+			if (type_str == (*itr).second) {
+				found = 1;
+				ptr_->type = (*itr).first;
+				break;
+			}
+		}
+
+		if (!found) {
+			ptr_->type = 0;
+			printf("WARNING: Unrecognized XID type: %s\n", type_str.c_str());
+		}
 	}
 
 	// If this is a 4ID formatted as an IP address (x.x.x.x), we
@@ -273,14 +334,16 @@ Node::construct_from_strings(const std::string type_str, const std::string id_st
 /**
 * @brief Return the node's type as a string
 *
-* @return The node's type as a string. Will be one of:
+* The type string will either be one of the following built-in XID types or will match 
+* one of the entries in etc/xids.
 *			\n Node::XID_TYPE_AD_STRING
 *			\n Node::XID_TYPE_HID_STRING
 *			\n Node::XID_TYPE_CID_STRING
 *			\n Node::XID_TYPE_SID_STRING
 *			\n Node::XID_TYPE_IP_STRING
 *			\n Node::XID_TYPE_DUMMY_SOURCE
 *			\n Node:: ID_TYPE_UNKNOWN_STRING
+* @return the node's type as a string
 */
 std::string
 Node::type_string() const
@@ -300,7 +363,11 @@ Node::type_string() const
 		case XID_TYPE_DUMMY_SOURCE:
 			return XID_TYPE_DUMMY_SOURCE_STRING;
 		default:
-			return XID_TYPE_UNKNOWN_STRING;
+			std::string s = xids[this->type()];
+			if (s.empty())
+				s = XID_TYPE_UNKNOWN_STRING;
+
+			return s;
 	}
 }
 

api/include/dagaddr.hpp

@@ -1,8 +1,17 @@
 #pragma once
 
+ #define PATH_SIZE 4096
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+
+
+
 #include <stdint.h>	// for non-c++0x
 #include <vector>
 #include <string>
+#include <map>
 #include "xia.h"
 
 class Graph;
@@ -28,7 +37,6 @@ class Node
 	static const std::string XID_TYPE_SID_STRING;
 	static const std::string XID_TYPE_IP_STRING;
 
-
 public:
 	Node();
 	Node(const Node& r);
@@ -55,6 +63,12 @@ class Node
 
 	bool equal_to(const Node& r) const;
 
+	typedef std::map<int, std::string> XidMap;
+	static XidMap xids;
+	static XidMap load_xids();
+
+	
+
 protected:
 	void acquire() const;
 	void release() const;

api/xsocket/Xutil.c

@@ -44,23 +44,10 @@ char *XrootDir(char *buf, unsigned len) {
 		strncpy(buf, dir, len);
 		return buf;
 	}
-#ifdef __APPLE__
 	if (!getcwd(buf, len)) {
 		buf[0] = 0;
 		return buf;
 	}
-#else
-	int cnt = readlink("/proc/self/exe", buf, MIN(len, PATH_SIZE));
-
-	if (cnt < 0) {
-		buf[0] = 0;
-		return buf;
-	}
-	else if ((unsigned)cnt == len)
-		buf[len - 1] = 0;
-	else
-		buf[cnt] = 0;
-#endif
 	pos = strstr(buf, SOURCE_DIR);
 	if (pos) {
 		pos += sizeof(SOURCE_DIR) - 1;

bin/xianet

@@ -34,6 +34,8 @@ ALL_PROCESSES="click xrouted xhcp_serverd xhcp_clientd xnameservice xstats xstat
 NAME=`basename $0`
 VERBOSE=0
 LOG_FLAGS=""
+LOG_LEVEL=6
+V_FLAG="-q"
 CLICK_ONLY=0
 NAMESERVER=0
 RUN_VISUALIZER_CLIENT=0
@@ -93,16 +95,19 @@ setup()
 				;;
 			l)
 				LOG_FLAGS="$LOG_FLAGS -l $OPTARG"
+				LOG_LEVEL=$OPTARG
 				;;
 			s)
 				SCRIPT=$OPTARG
 				;;
 			V)
 				VERBOSE=2
 				LOG_FLAGS="$LOG_FLAGS -v"
+				V_FLAG="-v"
 				;;
 			v)
 				VERBOSE=1
+				V_FLAG="-v"
 				;;
 			4)
 				MAKECONF="dual$MAKECONF"
@@ -409,17 +414,19 @@ start_click()
 		printf "$HOSTNAME\tnameserver\n" >> $NODECONF
 	fi
 
-	if [ $VERBOSE -eq 0 ]; then
-		exec 3>&1  # save stdout handle
-		exec &> /dev/null
-	fi
+#	if [ $VERBOSE -eq 0 ]; then
+#		exec 3>&1  # save stdout handle
+#		exec &> /dev/null
+#	fi
 
 	$CLICK -R $CONFPATH/$SCRIPT &
-	[ $VERBOSE -eq 0 ] && exec 1>&3
+#	[ $VERBOSE -eq 0 ] && exec 1>&3
 
 	get_pid "click"
 	[ "$XPID" == "" ] && printf "Click is not running, aborting...\n" && exit 1
 
+	$XIADIR/bin/xlog $V_FLAG -l $LOG_LEVEL >/dev/null
+
 	[ $CLICK_ONLY -eq 1 ] && check_service click && exit
 	sleep 1
 }

bin/xlog

@@ -0,0 +1,73 @@
+#!/bin/bash
+#
+# Copyright 2013 Carnegie Mellon University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PORT=7777
+
+check() {
+	# see if click is running
+	pid=`ps aux | grep -v grep | grep userlevel/click | tr -s " " | cut -d\  -f2`
+	[ "$pid" == "" ] && printf "Click is not running, aborting...\n" && exit 1
+}
+
+get() {
+	check
+	printf "$1: "
+	printf "read log.$1\nquit\n" | nc localhost $PORT | sed -n '4p'
+}
+
+put() {
+	check
+	printf "write log.$1 $2\nquit\n" | nc localhost $PORT > /dev/null
+}
+
+help() {
+	cat << EOH
+
+Adjust XIA click logging output
+
+usage: xlog [-vq] [-l <loglevel>]
+
+where:
+  -v output log messages to the console
+  -q disable console logging
+  -l syslog level (0=LOG_EMERG through 7=LOG_DEBUG) default=6 (LOG_INFO)
+
+EOH
+	exit 0
+}
+
+while getopts "hvql:" opt; do
+	case $opt in
+		v)
+			put verbose 1
+			;;
+		q)
+			put verbose 0
+			;;
+		l)
+			put level $OPTARG
+			;;
+		h)
+			help
+			;;
+		\?)
+			help
+			;;
+	esac
+done
+
+get verbose
+get level

bin/xroute

@@ -287,6 +287,9 @@ class XrouteApp:
 	# the main logic of the xroute app
 	#
 	def run(self):
+		# load user defined XIDs
+		self.loadXids()
+
 		# get the command line options
 		self.options = Options()
 		self.options.getOptions()
@@ -364,6 +367,32 @@ class XrouteApp:
 			self.errorExit("error %d: %s" % (code, msg))
 		return code
 
+	#
+	# load XIDs from file
+	#
+	def loadXids(self):
+		xfile = os.path.dirname(os.path.realpath(__file__))
+		tail = xfile.rfind("/")
+		xfile = xfile[:tail] + "/etc/xids"
+
+		try:
+			lines = open(xfile, "r")
+		except:
+			return
+
+		for line in lines:
+			comment = line.find("#")
+			if comment >= 0:
+				line = line[:comment]
+			line = line.strip()
+
+			if (line == ""):
+				continue
+
+			(id, name) = line.split()
+			KNOWN_XIDS.append(name)
+		lines.close()
+
 	#
 	# print the list of known alias to XID mappings to stdout
 	#