fix bug: MsgSender::type return value incorrect

yodaos-project · May 23, 2019 · ec8651c · ec8651c
1 parent 899ec8b
commit ec8651c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/src/cli.cc b/src/cli.cc
@@ -765,15 +765,9 @@ const char* MsgSender::name() {
 
 void MsgSender::to_string(string& str) {
   str = "[";
-  if (MsgSender::connection_type() == 0) {
-    char buf[16];
-    snprintf(buf, sizeof(buf), "%d", MsgSender::pid());
-    str += buf;
-  } else {
-    string tmp;
-    flora::internal::TagHelper::to_addr_string(flora::internal::Client::tag, tmp);
-    str += tmp;
-  }
+  string tmp;
+  flora::internal::TagHelper::to_string(flora::internal::Client::tag, tmp);
+  str += tmp;
   str += "]";
   str += MsgSender::name();
 }

diff --git a/src/disp.cc b/src/disp.cc
@@ -221,7 +221,7 @@ void Dispatcher::do_erase_adapter(shared_ptr<Adapter> &sender) {
     monitors.erase(reinterpret_cast<intptr_t>(sender.get()));
   else {
     string str;
-    TagHelper::to_addr_string(sender->tag, str);
+    TagHelper::to_string(sender->tag, str);
     KLOGI(TAG, "erase adapter <%s>:%s", str.c_str(),
           sender->info->name.c_str());
     write_monitor_list_remove(sender->info->id);

diff --git a/src/ser-helper.h b/src/ser-helper.h
@@ -200,7 +200,7 @@ class TagHelper {
   // return: 0  unix
   //         1  tcp
   static uint32_t type(uint64_t tag) {
-    return (tag >> 32) & 0x80000000;
+    return ((tag >> 32) & 0x80000000) ? 1 : 0;
   }
 
   static pid_t pid(uint64_t tag) {
@@ -217,12 +217,17 @@ class TagHelper {
     return (tag >> 32) & 0xffff;
   }
 
-  static void to_addr_string(uint64_t tag, std::string& str) {
-    str = ipaddr(tag);
-    str += ':';
+  static void to_string(uint64_t tag, std::string& str) {
     char buf[16];
-    snprintf(buf, sizeof(buf), "%d", port(tag));
-    str += buf;
+    if (type(tag) == 0) {
+      snprintf(buf, sizeof(buf), "%d", pid(tag));
+      str = buf;
+    } else {
+      str = ipaddr(tag);
+      str += ':';
+      snprintf(buf, sizeof(buf), "%d", port(tag));
+      str += buf;
+    }
   }
 };