Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2010-06-29 17:42:39 -0400
committereutarass2010-06-29 17:42:39 -0400
commit7edf27d6ec76604a13db68dcb5664b0703c61d8f (patch)
treeff701324484989a9d0ded2d6786ce2f13720ec83 /main/server.c
parent0fd823bc70bc6ff1265ebe1f082aada1efb3dea7 (diff)
downloadorg.eclipse.tcf.agent-7edf27d6ec76604a13db68dcb5664b0703c61d8f.tar.gz
org.eclipse.tcf.agent-7edf27d6ec76604a13db68dcb5664b0703c61d8f.tar.xz
org.eclipse.tcf.agent-7edf27d6ec76604a13db68dcb5664b0703c61d8f.zip
Bug 317845: TCF Peer accessible via two networks appear as two distinct peers
Diffstat (limited to 'main/server.c')
-rw-r--r--main/server.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/server.c b/main/server.c
index b356fe52..91eed512 100644
--- a/main/server.c
+++ b/main/server.c
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <framework/errors.h>
+#include <framework/myalloc.h>
#include <main/server.h>
static Protocol * proto;
@@ -40,6 +41,9 @@ void ini_server(const char * url, Protocol * p, TCFBroadcastGroup * b) {
fprintf(stderr, "Invalid server URL (-s option value): %s\n", url);
exit(1);
}
+
+ peer_server_addprop(ps, loc_strdup("ServerManagerID"), loc_strdup(get_service_manager_id(p)));
+
proto = p;
bcg = b;
serv = channel_server(ps);

Back to the top