Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

add option to send/receive invite data in binary/common form (as relay invites do)

Browse source
This commit is contained in:
Eric House 2015-07-24 22:37:41 -07:00
parent ed8d2ba0f6
commit 1484a27daf
1 changed files with 41 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
View file

@ -50,6 +50,7 @@ import org.eehouse.android.xw4.MultiService.MultiEvent;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType; import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
import org.eehouse.android.xw4.jni.CommsAddrRec; import org.eehouse.android.xw4.jni.CommsAddrRec;
import org.eehouse.android.xw4.jni.LastMoveInfo; import org.eehouse.android.xw4.jni.LastMoveInfo;
import org.eehouse.android.xw4.jni.XwJNI;
import org.eehouse.android.xw4.loc.LocUtils; import org.eehouse.android.xw4.loc.LocUtils;
import junit.framework.Assert; import junit.framework.Assert;
@ -59,7 +60,10 @@ public class BTService extends XWService {
private static final long RESEND_TIMEOUT = 5; // seconds private static final long RESEND_TIMEOUT = 5; // seconds
private static final int MAX_SEND_FAIL = 3; private static final int MAX_SEND_FAIL = 3;
private static final int BT_PROTO = 1; // using jsons instead of lots of fields private static final int BT_PROTO_ORIG = 0;
private static final int BT_PROTO_JSONS = 1; // using jsons instead of lots of fields
private static final int BT_PROTO_NLI = 2; // using binary/common form of NLI
private static final int BT_PROTO = BT_PROTO_JSONS; // change in a release or two
private enum BTAction { _NONE, private enum BTAction { _NONE,
SCAN, SCAN,
@ -461,32 +465,32 @@ public class BTService extends XWService {
inStream = new DataInputStream( socket.getInputStream() ); inStream = new DataInputStream( socket.getInputStream() );
byte proto = inStream.readByte(); byte proto = inStream.readByte();
if ( proto != BT_PROTO ) { BTCmd cmd = BTCmd.values()[inStream.readByte()];
DataOutputStream os = new DataOutputStream( socket.getOutputStream() ); if ( protoOK( proto, cmd ) ) {
os.writeByte( BTCmd.BAD_PROTO.ordinal() );
os.flush();
socket.close();
sendBadProto( socket );
} else {
byte msg = inStream.readByte();
BTCmd cmd = BTCmd.values()[msg];
switch( cmd ) { switch( cmd ) {
case PING: case PING:
receivePing( socket ); receivePing( socket );
break; break;
case INVITE: case INVITE:
receiveInvitation( inStream, socket ); receiveInvitation( proto, inStream, socket );
break; break;
case MESG_SEND: case MESG_SEND:
receiveMessage( inStream, socket ); receiveMessage( inStream, socket );
break; break;
default: default:
DbgUtils.logf( "unexpected msg %d", msg ); DbgUtils.logf( "unexpected msg %s", cmd.toString());
break; break;
} }
updateStatusIn( true ); updateStatusIn( true );
} else {
DataOutputStream os =
new DataOutputStream( socket.getOutputStream() );
os.writeByte( BTCmd.BAD_PROTO.ordinal() );
os.flush();
socket.close();
sendBadProto( socket );
} }
} catch ( IOException ioe ) { } catch ( IOException ioe ) {
DbgUtils.logf( "trying again..." ); DbgUtils.logf( "trying again..." );
@ -518,6 +522,12 @@ public class BTService extends XWService {
interrupt(); interrupt();
} }
private boolean protoOK( byte proto, BTCmd cmd )
{
boolean ok = proto == BT_PROTO_NLI || proto == BT_PROTO_JSONS;
return ok;
}
private void receivePing( BluetoothSocket socket ) throws IOException private void receivePing( BluetoothSocket socket ) throws IOException
{ {
DataInputStream inStream = new DataInputStream( socket.getInputStream() ); DataInputStream inStream = new DataInputStream( socket.getInputStream() );
@ -533,13 +543,21 @@ public class BTService extends XWService {
updateStatusOut( true ); updateStatusOut( true );
} }
private void receiveInvitation( DataInputStream is, private void receiveInvitation( byte proto, DataInputStream is,
BluetoothSocket socket ) BluetoothSocket socket )
throws IOException throws IOException
{ {
BTCmd result; BTCmd result;
String asJson = is.readUTF(); NetLaunchInfo nli;
NetLaunchInfo nli = new NetLaunchInfo( BTService.this, asJson ); if ( BT_PROTO_JSONS == proto ) {
String asJson = is.readUTF();
nli = new NetLaunchInfo( BTService.this, asJson );
} else {
short len = is.readShort();
byte[] nliData = new byte[len];
is.read( nliData );
nli = XwJNI.nliFromStream( nliData );
}
BluetoothDevice host = socket.getRemoteDevice(); BluetoothDevice host = socket.getRemoteDevice();
addAddr( host ); addAddr( host );
@ -795,7 +813,13 @@ public class BTService extends XWService {
BTCmd reply = null; BTCmd reply = null;
DataOutputStream outStream = connect( socket, BTCmd.INVITE ); DataOutputStream outStream = connect( socket, BTCmd.INVITE );
if ( null != outStream ) { if ( null != outStream ) {
outStream.writeUTF( elem.m_nli.toString() ); if ( BT_PROTO == BT_PROTO_JSONS ) {
outStream.writeUTF( elem.m_nli.toString() );
} else {
byte[] nliData = XwJNI.nliToStream( elem.m_nli );
outStream.writeShort( nliData.length );
outStream.write( nliData, 0, nliData.length );
}
DbgUtils.logf( "<eeh>sending invite for %d players", elem.m_nPlayersH ); DbgUtils.logf( "<eeh>sending invite for %d players", elem.m_nPlayersH );
outStream.flush(); outStream.flush();