Author: igalic
Date: Fri Sep 16 21:00:29 2011
New Revision: 1171778
URL: http://svn.apache.org/viewvc?rev=1171778&view=rev
Log:
TS-953: consolidate string copy/concat for wccp. Remove private copy of NO_FD.
Modified:
trafficserver/traffic/trunk/lib/wccp/WccpEndPoint.cc
trafficserver/traffic/trunk/lib/wccp/WccpLocal.h
trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc
Modified: trafficserver/traffic/trunk/lib/wccp/WccpEndPoint.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/wccp/WccpEndPoint.cc?rev=1171778&r1=1171777&r2=1171778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/wccp/WccpEndPoint.cc (original)
+++ trafficserver/traffic/trunk/lib/wccp/WccpEndPoint.cc Fri Sep 16 21:00:29
2011
@@ -23,6 +23,7 @@
# include "WccpUtil.h"
# include "WccpMeta.h"
# include <errno.h>
+# include "ink_string.h"
// ------------------------------------------------------
namespace wccp {
// ------------------------------------------------------
@@ -36,7 +37,7 @@ Impl::GroupData&
Impl::GroupData::setKey(char const* key) {
m_use_security_key = true;
memset(m_security_key, 0, SecurityComp::KEY_SIZE);
- strncpy(m_security_key, key, SecurityComp::KEY_SIZE);
+ ink_strlcpy(m_security_key, key, SecurityComp::KEY_SIZE);
return *this;
}
@@ -132,7 +133,7 @@ Impl::useMD5Security(ts::ConstBuffer con
m_use_security_key = true;
memset(m_security_key, 0, SecurityComp::KEY_SIZE);
// Great. Have to cast or we get a link error.
- strncpy(m_security_key, key._ptr, std::min(key._size,
static_cast<size_t>(SecurityComp::KEY_SIZE)));
+ ink_strlcpy(m_security_key, key._ptr, std::min(key._size,
static_cast<size_t>(SecurityComp::KEY_SIZE)));
}
SecurityOption
Modified: trafficserver/traffic/trunk/lib/wccp/WccpLocal.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/wccp/WccpLocal.h?rev=1171778&r1=1171777&r2=1171778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/wccp/WccpLocal.h (original)
+++ trafficserver/traffic/trunk/lib/wccp/WccpLocal.h Fri Sep 16 21:00:29 2011
@@ -32,11 +32,6 @@
# include <malloc.h>
# include <map>
-namespace ts {
-/// Null / invalid file descriptor.
-static const int NO_FD = -1;
-}
-
namespace wccp {
// Forward declares
Modified: trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc?rev=1171778&r1=1171777&r2=1171778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc (original)
+++ trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc Fri Sep 16 21:00:29 2011
@@ -25,6 +25,7 @@
# include <openssl/md5.h>
# include <TsException.h>
# include "ink_memory.h"
+# include "ink_string.h"
namespace wccp {
// ------------------------------------------------------
@@ -424,14 +425,14 @@ SecurityComp&
SecurityComp::setKey(char const* key) {
m_local_key = true;
memset(m_key, 0, KEY_SIZE);
- strncpy(m_key, key, KEY_SIZE);
+ ink_strlcpy(m_key, key, KEY_SIZE);
return *this;
}
void
SecurityComp::setDefaultKey(char const* key) {
memset(m_default_key, 0, KEY_SIZE);
- strncpy(m_default_key, key, KEY_SIZE);
+ ink_strlcpy(m_default_key, key, KEY_SIZE);
}
SecurityComp&
