to telnet interface add ability to forget device and to send to one

not known (which will make message available next time it connects or
via GCM); rename methods.

xwords4/relay/cref.cpp

@@ -948,7 +948,7 @@ CookieRef::increasePlayerCounts( CRefEvent* evt, bool reconn, HostID* hidp,
         if ( ID_TYPE_NONE != devIDType ) { 
             devID = DBMgr::Get()->RegisterDevice( evt->u.con.devID );
             if ( addr->isUDP() ) {
-                DevMgr::Get()->Remember( devID, addr );
+                DevMgr::Get()->rememberDevice( devID, addr );
             }
         }
         *devIDp = devID;

xwords4/relay/ctrl.cpp

@@ -554,7 +554,14 @@ cmd_devs( int socket, const char* cmd, int argc, gchar** args )
                            devid );
         }
         found = true;
-    } else if ( 0 == strcmp( "rm", args[1] ) ) {
+    } else if ( 0 == strcmp( "rm", args[1] ) && 2 < argc  ) {
+        DevIDRelay devid = (DevIDRelay)strtoul( args[2], NULL, 10 );
+        if ( DevMgr::Get()->forgetDevice( devid ) ) {
+            string_printf( result, "dev %d removed\n", devid );
+        } else {
+            string_printf( result, "dev %d unknown\n", devid );
+        }
+        found = true;
     }
 
     if ( found ) {

xwords4/relay/devmgr.cpp

@@ -36,7 +36,7 @@ DevMgr::Get()
 } /* Get */
 
 void
-DevMgr::Remember( DevIDRelay devid, const AddrInfo::AddrUnion* saddr )
+DevMgr::rememberDevice( DevIDRelay devid, const AddrInfo::AddrUnion* saddr )
 {
     if ( DBMgr::DEVID_NONE != devid ) {
         gchar* b64 = g_base64_encode( (unsigned char*)&saddr->u.addr, 
@@ -81,9 +81,9 @@ DevMgr::Remember( DevIDRelay devid, const AddrInfo::AddrUnion* saddr )
 }
 
 void
-DevMgr::Remember( DevIDRelay devid, const AddrInfo* addr )
+DevMgr::rememberDevice( DevIDRelay devid, const AddrInfo* addr )
 {
-    Remember( devid, addr->saddr() );
+    rememberDevice( devid, addr->saddr() );
 }
 
 const AddrInfo::AddrUnion* 
@@ -102,6 +102,19 @@ DevMgr::get( DevIDRelay devid )
     return result;
 }
 
+bool 
+DevMgr::forgetDevice( DevIDRelay devid )
+{
+    MutexLock ml( &m_mapLock );
+    map<DevIDRelay,UDPAddrRec>::iterator iter = m_devAddrMap.find( devid );
+    bool found = m_devAddrMap.end() != iter;
+    if ( found ) {
+        m_devAddrMap.erase( iter );
+    }
+    return found;
+}
+
+
 // Print info about every device, ordered by how old they are (how long since
 // last remembered).  Build a separate array with the mutex held, then release
 // it, so that as much work as possible is done on the calling thread without

xwords4/relay/devmgr.h

@@ -31,12 +31,13 @@ using namespace std;
 class DevMgr {
  public:
     static DevMgr* Get();
-    void Remember( DevIDRelay devid, const AddrInfo::AddrUnion* saddr );
-    void Remember( DevIDRelay devid, const AddrInfo* addr );
+    void rememberDevice( DevIDRelay devid, const AddrInfo::AddrUnion* saddr );
+    void rememberDevice( DevIDRelay devid, const AddrInfo* addr );
     const AddrInfo::AddrUnion* get( DevIDRelay devid );
 
     /* Called from ctrl port */
     void printDevices( string& str, DevIDRelay devid /* 0 means all */ );
+    bool forgetDevice( DevIDRelay devid );
 
  private:
 

xwords4/relay/xwrelay.cpp

@@ -649,30 +649,33 @@ post_message( DevIDRelay devid, const char* message, OnMsgAckProc proc,
               void* procClosure )
 {
     const AddrInfo::AddrUnion* addru = DevMgr::Get()->get( devid );
-    bool success = !!addru;
-    if ( success ) {
-        AddrInfo addr( addru );
-        short len = strlen(message);
-        short netLen = htons(len);
-        uint32_t packetID;
+    bool canSendNow = !!addru;
+    short len = strlen( message );
+    short netLen = htons( len );
     uint8_t buf[1 + sizeof(netLen) + len];
     XWRelayReg cmd = XWPDEV_ALERT;
     buf[0] = cmd;
     memcpy( &buf[1], &netLen, sizeof(netLen) );
     memcpy( &buf[1 + sizeof(netLen)], message, len );
 
-        bool sent = send_via_udp( &addr, &packetID, cmd, &buf[1], 
+    bool sent = false;
+    if ( canSendNow ) {
+        AddrInfo addr( addru );
+        uint32_t packetID;
+
+        sent = send_via_udp( &addr, &packetID, cmd, &buf[1], 
                              VSIZE(buf)-1, NULL );
         if ( sent ) {
             MsgClosure* mc = new MsgClosure( devid, buf, VSIZE(buf),
                                              proc, procClosure );
             UDPAckTrack::setOnAck( onPostedMsgAcked, packetID, (void*)mc );
-        } else {
+        }
+    }
+    if ( !sent ) {
         DBMgr::Get()->StoreMessage( devid, (const unsigned char*)buf, 
                                     VSIZE(buf) );
     }
-    }
-    return success;
+    return sent;
 }
 
 /* A CONNECT message from a device gives us the hostID and socket we'll
@@ -1405,7 +1408,7 @@ registerDevice( const DevID* devID, const AddrInfo* addr, int clientVers,
                       &maxInterval, sizeof(maxInterval), NULL );
 
         // Map the address to the devid for future sending purposes.
-        DevMgr::Get()->Remember( relayID, addr );
+        DevMgr::Get()->rememberDevice( relayID, addr );
     }
 }
 
@@ -1558,7 +1561,7 @@ handle_udp_packet( UdpThreadClosure* utc )
             ptr += idLen;
 
             const AddrInfo* addr = utc->addr();
-            DevMgr::Get()->Remember( devID.asRelayID(), addr );
+            DevMgr::Get()->rememberDevice( devID.asRelayID(), addr );
 
             if ( XWPDEV_RQSTMSGS == header.cmd ) {
                 retrieveMessages( devID, addr );