You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/05/06 22:49:00 UTC
git commit: TS-2784 Fix build for FreeBSD10
Repository: trafficserver
Updated Branches:
refs/heads/master 6397b1610 -> 3b6748ed2
TS-2784 Fix build for FreeBSD10
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3b6748ed
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3b6748ed
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3b6748ed
Branch: refs/heads/master
Commit: 3b6748ed2117cd824049498508fa3b1609f5638a
Parents: 6397b16
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue May 6 14:48:48 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue May 6 14:48:52 2014 -0600
----------------------------------------------------------------------
plugins/header_rewrite/condition.cc | 3 ++-
plugins/header_rewrite/condition.h | 3 ++-
plugins/header_rewrite/conditions.cc | 6 +++---
plugins/header_rewrite/conditions.h | 3 ++-
plugins/header_rewrite/expander.cc | 27 +++++++++++++++++----------
plugins/header_rewrite/expander.h | 8 +-------
plugins/header_rewrite/header_rewrite.cc | 4 ++--
plugins/header_rewrite/lulu.h | 3 +--
plugins/header_rewrite/matcher.cc | 3 ++-
plugins/header_rewrite/matcher.h | 5 +++--
plugins/header_rewrite/operator.cc | 2 +-
plugins/header_rewrite/operator.h | 3 ++-
plugins/header_rewrite/operators.cc | 3 ++-
plugins/header_rewrite/operators.h | 3 ++-
plugins/header_rewrite/parser.cc | 2 +-
plugins/header_rewrite/resources.cc | 2 +-
plugins/header_rewrite/resources.h | 5 +++--
plugins/header_rewrite/statement.cc | 3 +--
plugins/header_rewrite/statement.h | 3 ++-
plugins/header_rewrite/value.h | 3 ++-
20 files changed, 52 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/condition.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/condition.cc b/plugins/header_rewrite/condition.cc
index bcece21..e215dbf 100644
--- a/plugins/header_rewrite/condition.cc
+++ b/plugins/header_rewrite/condition.cc
@@ -19,9 +19,10 @@
// condition.cc: Implementation of the condition base class
//
//
-#include <ts/ts.h>
#include <string>
+#include "ts/ts.h"
+
#include "condition.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/condition.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/condition.h b/plugins/header_rewrite/condition.h
index 308e943..933ea09 100644
--- a/plugins/header_rewrite/condition.h
+++ b/plugins/header_rewrite/condition.h
@@ -23,7 +23,8 @@
#define __CONDITION_H__ 1
#include <string>
-#include <ts/ts.h>
+
+#include "ts/ts.h"
#include "resources.h"
#include "statement.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/conditions.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/conditions.cc b/plugins/header_rewrite/conditions.cc
index 46be14a..9010152 100644
--- a/plugins/header_rewrite/conditions.cc
+++ b/plugins/header_rewrite/conditions.cc
@@ -19,14 +19,14 @@
// conditions.cc: Implementation of the condition classes
//
//
+#include <sys/time.h>
#include <unistd.h>
-#include <ts/ts.h>
+
+#include "ts/ts.h"
#include "conditions.h"
#include "lulu.h"
-#include <sys/time.h>
-
// ConditionStatus
void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/conditions.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/conditions.h b/plugins/header_rewrite/conditions.h
index 2f4d093..deb3142 100644
--- a/plugins/header_rewrite/conditions.h
+++ b/plugins/header_rewrite/conditions.h
@@ -23,10 +23,11 @@
#define __CONDITIONS_H__ 1
#include <string>
-#include <ts/ts.h>
#include <boost/lexical_cast.hpp>
#include <cstring>
+#include "ts/ts.h"
+
#include "condition.h"
#include "matcher.h"
#include "value.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/expander.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/expander.cc b/plugins/header_rewrite/expander.cc
index 258ba47..c4a581c 100644
--- a/plugins/header_rewrite/expander.cc
+++ b/plugins/header_rewrite/expander.cc
@@ -19,17 +19,20 @@
//////////////////////////////////////////////////////////////////////////////////////////////
// expander.cc: Implementation of the Variable Expander base class
//
-#include <ts/ts.h>
-#include "expander.h"
+#include "ts/ts.h"
+
+#include <string>
+#include <sstream>
+#include "lulu.h"
+#include "statement.h"
+#include "parser.h"
+#include "expander.h"
// Helper function to cleanly get the IP as a string.
std::string
-getIP(sockaddr const * s_sockaddr)
+getIP(sockaddr const* s_sockaddr)
{
- const struct sockaddr_in *s_sockaddr_in;
- const struct sockaddr_in6 *s_sockaddr_in6;
-
if (s_sockaddr == NULL)
return "";
@@ -37,12 +40,16 @@ getIP(sockaddr const * s_sockaddr)
switch (s_sockaddr->sa_family) {
case AF_INET:
- s_sockaddr_in = reinterpret_cast<const struct sockaddr_in *>(s_sockaddr);
- inet_ntop(s_sockaddr_in->sin_family, &s_sockaddr_in->sin_addr, res, INET_ADDRSTRLEN);
+ {
+ const struct sockaddr_in *s_sockaddr_in = reinterpret_cast<const struct sockaddr_in *>(s_sockaddr);
+ inet_ntop(AF_INET, &s_sockaddr_in->sin_addr, res, INET_ADDRSTRLEN);
+ }
break;
case AF_INET6:
- s_sockaddr_in6 = reinterpret_cast<const struct sockaddr_in6 *>(s_sockaddr);
- inet_ntop(s_sockaddr_in6->sin6_family, &s_sockaddr_in6->sin6_addr, res, INET6_ADDRSTRLEN);
+ {
+ const struct sockaddr_in6 *s_sockaddr_in6 = reinterpret_cast<const struct sockaddr_in6 *>(s_sockaddr);
+ inet_ntop(AF_INET6, &s_sockaddr_in6->sin6_addr, res, INET6_ADDRSTRLEN);
+ }
break;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/expander.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/expander.h b/plugins/header_rewrite/expander.h
index cc28637..50c0a87 100644
--- a/plugins/header_rewrite/expander.h
+++ b/plugins/header_rewrite/expander.h
@@ -23,15 +23,9 @@
#define __EXPANDER_H__ 1
#include <string>
-#include <ts/ts.h>
+#include "ts/ts.h"
#include "resources.h"
-#include "statement.h"
-#include "parser.h"
-
-#include <iostream>
-#include <arpa/inet.h>
-#include <sstream>
class VariableExpander {
public:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/header_rewrite.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/header_rewrite.cc b/plugins/header_rewrite/header_rewrite.cc
index 614d287..bb40398 100644
--- a/plugins/header_rewrite/header_rewrite.cc
+++ b/plugins/header_rewrite/header_rewrite.cc
@@ -19,8 +19,8 @@
#include <string>
#include <boost/algorithm/string.hpp>
-#include <ts/ts.h>
-#include <ts/remap.h>
+#include "ts/ts.h"
+#include "ts/remap.h"
#include "parser.h"
#include "ruleset.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/lulu.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/lulu.h b/plugins/header_rewrite/lulu.h
index 28b2e1b..2226848 100644
--- a/plugins/header_rewrite/lulu.h
+++ b/plugins/header_rewrite/lulu.h
@@ -22,9 +22,8 @@
#ifndef __LULU_H__
#define __LULU_H__ 1
-#include <sys/types.h>
-
#include "ink_defs.h"
+#include "ink_platform.h"
// Memory barriers
#if defined(__i386__)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/matcher.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/matcher.cc b/plugins/header_rewrite/matcher.cc
index a4afd4d..3c1f9b8 100644
--- a/plugins/header_rewrite/matcher.cc
+++ b/plugins/header_rewrite/matcher.cc
@@ -20,6 +20,7 @@
//
//
#include <string>
-#include <ts/ts.h>
+
+#include "ts/ts.h"
#include "matcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/matcher.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/matcher.h b/plugins/header_rewrite/matcher.h
index 29906a9..7eb9064 100644
--- a/plugins/header_rewrite/matcher.h
+++ b/plugins/header_rewrite/matcher.h
@@ -23,10 +23,11 @@
#define __MATCHER_H__ 1
#include <string>
-#include <ts/ts.h>
-#include "regex_helper.h"
#include <iostream> // For debugging
+#include "ts/ts.h"
+
+#include "regex_helper.h"
#include "lulu.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/operator.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/operator.cc b/plugins/header_rewrite/operator.cc
index 4297c93..6109a86 100644
--- a/plugins/header_rewrite/operator.cc
+++ b/plugins/header_rewrite/operator.cc
@@ -20,7 +20,7 @@
// operator.cc: Implementation of the operator base class
//
//
-#include <ts/ts.h>
+#include "ts/ts.h"
#include "operator.h"
const OperModifiers
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/operator.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/operator.h b/plugins/header_rewrite/operator.h
index a017b35..b365d44 100644
--- a/plugins/header_rewrite/operator.h
+++ b/plugins/header_rewrite/operator.h
@@ -23,7 +23,8 @@
#define __OPERATOR_H__ 1
#include <string>
-#include <ts/ts.h>
+
+#include "ts/ts.h"
#include "resources.h"
#include "statement.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/operators.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/operators.cc b/plugins/header_rewrite/operators.cc
index e22ab51..22165ff 100644
--- a/plugins/header_rewrite/operators.cc
+++ b/plugins/header_rewrite/operators.cc
@@ -20,9 +20,10 @@
//
//
#include <arpa/inet.h>
-#include <ts/ts.h>
#include <string.h>
+#include "ts/ts.h"
+
#include "operators.h"
#include "expander.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/operators.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/operators.h b/plugins/header_rewrite/operators.h
index 57d6608..b41fe7f 100644
--- a/plugins/header_rewrite/operators.h
+++ b/plugins/header_rewrite/operators.h
@@ -23,7 +23,8 @@
#define __OPERATORS_H__ 1
#include <string>
-#include <ts/ts.h>
+
+#include "ts/ts.h"
#include "operator.h"
#include "resources.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/parser.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/parser.cc b/plugins/header_rewrite/parser.cc
index a389858..a50e438 100644
--- a/plugins/header_rewrite/parser.cc
+++ b/plugins/header_rewrite/parser.cc
@@ -22,7 +22,7 @@
#include <utility>
#include <boost/tokenizer.hpp>
-#include <ts/ts.h>
+#include "ts/ts.h"
#include "parser.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/resources.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/resources.cc b/plugins/header_rewrite/resources.cc
index eb4afaf..8e34d3b 100644
--- a/plugins/header_rewrite/resources.cc
+++ b/plugins/header_rewrite/resources.cc
@@ -19,7 +19,7 @@
// resources.cc: Implementation of the resources class.
//
//
-#include <ts/ts.h>
+#include "ts/ts.h"
#include "resources.h"
#include "lulu.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/resources.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/resources.h b/plugins/header_rewrite/resources.h
index 5bda0da..ccb9e36 100644
--- a/plugins/header_rewrite/resources.h
+++ b/plugins/header_rewrite/resources.h
@@ -23,8 +23,9 @@
#define __RESOURCES_H__ 1
#include <string>
-#include <ts/ts.h>
-#include <ts/remap.h>
+
+#include "ts/ts.h"
+#include "ts/remap.h"
#include "lulu.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/statement.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/statement.cc b/plugins/header_rewrite/statement.cc
index 1538f52..439cdab 100644
--- a/plugins/header_rewrite/statement.cc
+++ b/plugins/header_rewrite/statement.cc
@@ -19,8 +19,7 @@
// statement.cc: Implementation of the statement base class.
//
//
-
-#include <ts/ts.h>
+#include "ts/ts.h"
#include "statement.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/statement.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/statement.h b/plugins/header_rewrite/statement.h
index 0db1eb2..8620543 100644
--- a/plugins/header_rewrite/statement.h
+++ b/plugins/header_rewrite/statement.h
@@ -25,7 +25,8 @@
#include <string>
#include <vector>
-#include <ts/ts.h>
+
+#include "ts/ts.h"
#include "resources.h"
#include "parser.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b6748ed/plugins/header_rewrite/value.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/value.h b/plugins/header_rewrite/value.h
index 9fb5856..8e6c8f9 100644
--- a/plugins/header_rewrite/value.h
+++ b/plugins/header_rewrite/value.h
@@ -23,7 +23,8 @@
#define __VALUE_H__ 1
#include <string>
-#include <ts/ts.h>
+
+#include "ts/ts.h"
#include "resources.h"
#include "statement.h"