From: Jennifer Richards <jennifer@painless-security.com>
Date: Tue, 12 Sep 2017 14:45:07 +0000 (-0400)
Subject: Merge branch 'master' into debian-testing
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=78ce3968330e84cb5046a8ef0040fcf7dcff2079;hp=185f9f596d02bdeb24feb5a1c1097d21b0008d80;p=trust_router.git

Merge branch 'master' into debian-testing
---

diff --git a/tid/tids.c b/tid/tids.c
index c1071be..c1c9bcb 100644
--- a/tid/tids.c
+++ b/tid/tids.c
@@ -432,15 +432,15 @@ int tids_get_listener(TIDS_INSTANCE *tids,
   tids->tids_port = port;
   n_fd=tids_listen(tids, port, fd_out, max_fd);
   if (n_fd<=0)
-    tr_debug("tids_get_listener: Error opening port %d");
+    tr_err("tids_get_listener: Error opening port %d");
   else {
     /* opening port succeeded */
-    tr_debug("tids_get_listener: Opened port %d.", port);
+    tr_info("tids_get_listener: Opened port %d.", port);
     
     /* make this socket non-blocking */
     for (ii=0; ii<n_fd; ii++) {
       if (0 != fcntl(fd_out[ii], F_SETFL, O_NONBLOCK)) {
-        tr_debug("tids_get_listener: Error setting O_NONBLOCK.");
+        tr_err("tids_get_listener: Error setting O_NONBLOCK.");
         for (ii=0; ii<n_fd; ii++) {
           close(fd_out[ii]);
           fd_out[ii]=-1;
diff --git a/trp/trps.c b/trp/trps.c
index 94ff111..ebc365d 100644
--- a/trp/trps.c
+++ b/trp/trps.c
@@ -464,15 +464,15 @@ int trps_get_listener(TRPS_INSTANCE *trps,
 
   n_fd=trps_listen(trps, port, fd_out, max_fd);
   if (n_fd==0)
-    tr_debug("trps_get_listener: Error opening port %d.");
+    tr_err("trps_get_listener: Error opening port %d.");
   else {
     /* opening port succeeded */
-    tr_debug("trps_get_listener: Opened port %d.", port);
+    tr_info("trps_get_listener: Opened port %d.", port);
     
     /* make the sockets non-blocking */
     for (ii=0; ii<n_fd; ii++) {
       if (0 != fcntl(fd_out[ii], F_SETFL, O_NONBLOCK)) {
-        tr_debug("trps_get_listener: Error setting O_NONBLOCK.");
+        tr_err("trps_get_listener: Error setting O_NONBLOCK.");
         for (ii=0; ii<n_fd; ii++) {
           close(fd_out[ii]);
           fd_out[ii]=-1;