diff --git a/Target.cc b/Target.cc
index 479d03fe4..31c368d87 100644
--- a/Target.cc
+++ b/Target.cc
@@ -200,7 +200,7 @@ void Target::GenerateIPString() {
      address since it is portable for IPv6 hosts.  Returns 0 for
      success. ss_len must be provided.  It is not examined, but is set
      to the size of the sockaddr copied in. */
-int Target::TargetSockAddr(struct sockaddr_storage *ss, size_t *ss_len) {
+int Target::TargetSockAddr(struct sockaddr_storage *ss, size_t *ss_len) const {
   assert(ss);
   assert(ss_len);  
   if (targetsocklen <= 0)
@@ -213,7 +213,7 @@ int Target::TargetSockAddr(struct sockaddr_storage *ss, size_t *ss_len) {
 
 /* Note that it is OK to pass in a sockaddr_in or sockaddr_in6 casted
      to sockaddr_storage */
-void Target::setTargetSockAddr(struct sockaddr_storage *ss, size_t ss_len) {
+void Target::setTargetSockAddr(const struct sockaddr_storage *ss, size_t ss_len) {
 
   assert(ss_len > 0 && ss_len <= sizeof(*ss));
   if (targetsocklen > 0) {
@@ -248,7 +248,7 @@ const struct in_addr *Target::v4hostip() const {
 }
 
  /* The source address used to reach the target */
-int Target::SourceSockAddr(struct sockaddr_storage *ss, size_t *ss_len) {
+int Target::SourceSockAddr(struct sockaddr_storage *ss, size_t *ss_len) const {
   if (sourcesocklen <= 0)
     return 1;
   assert(sourcesocklen <= sizeof(*ss));
@@ -261,7 +261,7 @@ int Target::SourceSockAddr(struct sockaddr_storage *ss, size_t *ss_len) {
 
 /* Note that it is OK to pass in a sockaddr_in or sockaddr_in6 casted
      to sockaddr_storage */
-void Target::setSourceSockAddr(struct sockaddr_storage *ss, size_t ss_len) {
+void Target::setSourceSockAddr(const struct sockaddr_storage *ss, size_t ss_len) {
   assert(ss_len > 0 && ss_len <= sizeof(*ss));
   memcpy(&sourcesock, ss, ss_len);
   sourcesocklen = ss_len;
diff --git a/Target.h b/Target.h
index 23bdbf107..a854549b4 100644
--- a/Target.h
+++ b/Target.h
@@ -163,18 +163,18 @@ class Target {
      address since it is portable for IPv6 hosts.  Returns 0 for
      success. ss_len must be provided.  It is not examined, but is set
      to the size of the sockaddr copied in. */
-  int TargetSockAddr(struct sockaddr_storage *ss, size_t *ss_len);
+  int TargetSockAddr(struct sockaddr_storage *ss, size_t *ss_len) const;
   /* Note that it is OK to pass in a sockaddr_in or sockaddr_in6 casted
      to sockaddr_storage */
-  void setTargetSockAddr(struct sockaddr_storage *ss, size_t ss_len);
+  void setTargetSockAddr(const struct sockaddr_storage *ss, size_t ss_len);
   // Returns IPv4 target host address or {0} if unavailable.
   struct in_addr v4host() const;
   const struct in_addr *v4hostip() const;
   /* The source address used to reach the target */
-  int SourceSockAddr(struct sockaddr_storage *ss, size_t *ss_len);
+  int SourceSockAddr(struct sockaddr_storage *ss, size_t *ss_len) const;
   /* Note that it is OK to pass in a sockaddr_in or sockaddr_in6 casted
      to sockaddr_storage */
-  void setSourceSockAddr(struct sockaddr_storage *ss, size_t ss_len);
+  void setSourceSockAddr(const struct sockaddr_storage *ss, size_t ss_len);
   struct in_addr v4source() const;
   const struct in_addr *v4sourceip() const;
   /* The IPv4 or IPv6 literal string for the target host */
@@ -183,7 +183,7 @@ class Target {
    the name obtained from reverse-resolution (PTR query) of the IP (v4
    or v6).  If the name has not been set, or was set to NULL, an empty
    string ("") is returned to make printing easier. */
-  const char *HostName() { return hostname? hostname : "";  }
+  const char *HostName() const { return hostname? hostname : "";  }
   /* You can set to NULL to erase a name or if it failed to resolve -- or 
      just don't call this if it fails to resolve.  The hostname is blown
      away when you setTargetSockAddr(), so make sure you do these in proper