merged with upstream

libretroshare/src/rsserver/p3peers.cc

@@ -296,8 +296,17 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d)
 		d.hiddenNodeAddress = ps.hiddenDomain;
 		d.hiddenNodePort = ps.hiddenPort;
 		d.hiddenType = ps.hiddenType;
-		d.localAddr	= sockaddr_storage_iptostring(ps.localaddr);
-		d.localPort	= sockaddr_storage_port(ps.localaddr);
+        
+		if(sockaddr_storage_isnull(ps.localaddr))	// that happens if the address is not initialised.
+        	{
+			d.localAddr	= "INVALID_IP";
+			d.localPort	= 0 ;
+        	}
+            	else
+        	{
+			d.localAddr	= sockaddr_storage_iptostring(ps.localaddr);
+			d.localPort	= sockaddr_storage_port(ps.localaddr);
+        	}
 		d.extAddr = "hidden";
 		d.extPort = 0;
 		d.dyndns = "";

libretroshare/src/rsserver/rsinit.cc

@@ -1336,7 +1336,14 @@ int RsServer::StartupRetroShare()
             false,false); // don't synchronise group automatic (need explicit group request)
                         // don't sync messages at all.
 
+        // Normally we wouldn't need this (we do in other service):
+        //	mGxsIdService->setNetworkExchangeService(gxsid_ns) ;
+        // ...since GxsIds are propagated manually. But that requires the gen exchange of GXSids to
+        // constantly test that mNetService is not null. The call below is to make the service aware of the
+        // netService so that it can request the missing ids. We'll need to fix this.
+
         mGxsIdService->setNes(gxsid_ns);
+
         /**** GxsCircle service ****/
 
         // create GXS Circle service

libretroshare/src/rsserver/rsloginhandler.cc

@@ -275,7 +275,7 @@ bool RsLoginHandler::tryAutoLogin(const RsPeerId& ssl_id,std::string& ssl_passwd
 		fseek(fp, 0, SEEK_SET);
 		dataptr = (char *) rs_malloc(datalen);
         
-        	if(data_ptr == NULL)
+        	if(dataptr == NULL)
             {
                 fclose(fp);
                 return false;