From 1eb82d52859b8557858688a4ed44d211c1e5c556 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 11 Jul 2015 14:27:01 -0700 Subject: [PATCH] android doesn't send its devid in the nli struct, so don't assert it's there. --- xwords4/common/nli.h | 2 +- xwords4/linux/relaycon.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xwords4/common/nli.h b/xwords4/common/nli.h index 7b0d0fd7b..721a839c4 100644 --- a/xwords4/common/nli.h +++ b/xwords4/common/nli.h @@ -49,7 +49,7 @@ typedef struct _InviteInfo { /* Relay */ XP_UCHAR room[MAX_INVITE_LEN + 1]; - XP_U32 devID; + XP_U32 devID; /* not used on android; remove?? */ /* BT */ XP_UCHAR btName[32]; diff --git a/xwords4/linux/relaycon.c b/xwords4/linux/relaycon.c index 2096e1bc0..050e477fa 100644 --- a/xwords4/linux/relaycon.c +++ b/xwords4/linux/relaycon.c @@ -344,8 +344,7 @@ relaycon_receive( GIOChannel* source, GIOCondition XP_UNUSED_DBG(condition), gpo stream_putBytes( stream, ptr, len ); NetLaunchInfo invit; XP_Bool success = nli_makeFromStream( &invit, stream ); - XP_LOGF( "sender: %d; invit.devID: %d", sender, invit.devID ); - XP_ASSERT( sender == invit.devID ); + XP_LOGF( "sender: %d", sender ); stream_destroy( stream ); if ( success ) {