You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/21 17:01:08 UTC
svn commit: r947033 - in /trafficserver/traffic/trunk: build/network.m4
configure.ac proxy/config/records.config.in
Author: mturk
Date: Fri May 21 15:01:08 2010
New Revision: 947033
URL: http://svn.apache.org/viewvc?rev=947033&view=rev
Log:
TS-355: Try to guess default network interface
Modified:
trafficserver/traffic/trunk/build/network.m4
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/proxy/config/records.config.in
Modified: trafficserver/traffic/trunk/build/network.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/network.m4?rev=947033&r1=947032&r2=947033&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/network.m4 (original)
+++ trafficserver/traffic/trunk/build/network.m4 Fri May 21 15:01:08 2010
@@ -85,3 +85,27 @@ if test "$ac_cv_gethostbyname_r_arg" = "
AC_DEFINE(GETHOSTBYNAME_R_HOSTENT_DATA, 1, [Define if gethostbyname_r has the hostent_data for the third argument])
fi
])
+
+dnl
+dnl ATS_CHECK_DEFAULT_IFACE: try to figure out default network interface
+dnl
+AC_DEFUN([ATS_CHECK_DEFAULT_IFACE], [
+default_net_iface=""
+AC_MSG_CHECKING([for default network interface])
+case $host_os in
+ linux*)
+ default_net_iface=[`/sbin/ifconfig | sed 's/^ *$/CRLF/g' | tr '\n' ' ' | sed 's/CRLF /\n/g' | grep -v LOOPBACK | grep 'UP.*RUNNING' | head -1 | awk '{ n=1; print $n; }' 2>/dev/null`]
+ ;;
+darwin* | freebsd* | solaris*)
+ default_net_iface=[`/sbin/ifconfig -a | grep 'UP.*RUNNING' | grep -v LOOPBACK | head -1 | awk -F: '{ n=1; print $n; }'`]
+ ;;
+esac
+if test "x$default_net_iface" = "x"; then
+ AC_MSG_RESULT([not found. Using default eth0])
+ default_net_iface=eth0
+else
+ AC_MSG_RESULT([$default_net_iface])
+fi
+AC_SUBST([default_net_iface])
+])
+dnl
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=947033&r1=947032&r2=947033&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Fri May 21 15:01:08 2010
@@ -839,7 +839,7 @@ ATS_FLAG_HEADERS([google/profiler.h \
], [], [])
fi
-
+ATS_CHECK_DEFAULT_IFACE
ATS_CHECK_GETHOSTBYNAME_R_STYLE
#
Modified: trafficserver/traffic/trunk/proxy/config/records.config.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.in?rev=947033&r1=947032&r2=947033&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.in Fri May 21 15:01:08 2010
@@ -302,7 +302,7 @@ CONFIG proxy.config.net.tcp_accept_defer
#
##############################################################################
CONFIG proxy.config.cluster.cluster_port INT 8086
-CONFIG proxy.config.cluster.ethernet_interface STRING eth0
+CONFIG proxy.config.cluster.ethernet_interface STRING @default_net_iface@
##############################################################################
#
# Cache