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

pass default hostname in from platform code rather than compiling it

Browse source 
into jni; in java pull it from preferences and pass into jni.
This commit is contained in:
eehouse 2010-03-21 03:12:58 +00:00
parent a32975362a
commit 786541e9ae
6 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4/jni/Android.mk
View file

@ -14,7 +14,6 @@ local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING
local_DEFINES += \ local_DEFINES += \
$(local_DEBUG) \ $(local_DEBUG) \
-DXWFEATURE_RELAY \ -DXWFEATURE_RELAY \
-DRELAY_NAME_DEFAULT=\"eehouse.org\" \
-DRELAY_PORT_DEFAULT=10999 \ -DRELAY_PORT_DEFAULT=10999 \
-DXWFEATURE_TURNCHANGENOTIFY \ -DXWFEATURE_TURNCHANGENOTIFY \
-DKEYBOARD_NAV \ -DKEYBOARD_NAV \

8
xwords4/android/XWords4/jni/xwjni.c
View file

@ -227,11 +227,13 @@ Java_org_eehouse_android_xw4_jni_XwJNI_gi_1from_1stream
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getInitialAddr Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getInitialAddr
( JNIEnv* env, jclass C, jobject jaddr ) ( JNIEnv* env, jclass C, jobject jaddr, jstring jname )
{ {
LOG_FUNC();
CommsAddrRec addr; CommsAddrRec addr;
comms_getInitialAddr( &addr );
const char* chars = (*env)->GetStringUTFChars( env, jname, NULL );
comms_getInitialAddr( &addr, chars );
(*env)->ReleaseStringUTFChars( env, jname, chars );
setJAddrRec( env, jaddr, &addr ); setJAddrRec( env, jaddr, &addr );
} }

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -343,7 +343,8 @@ public class GameConfig extends Activity implements View.OnClickListener {
if ( XwJNI.game_hasComms( gamePtr ) ) { if ( XwJNI.game_hasComms( gamePtr ) ) {
XwJNI.comms_getAddr( gamePtr, m_carOrig ); XwJNI.comms_getAddr( gamePtr, m_carOrig );
} else { } else {
XwJNI.comms_getInitialAddr( m_carOrig ); String relayName = CommonPrefs.getDefaultRelayHost();
XwJNI.comms_getInitialAddr( m_carOrig, relayName );
} }
XwJNI.game_dispose( gamePtr ); XwJNI.game_dispose( gamePtr );

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
View file

@ -21,7 +21,8 @@ public class XwJNI {
// Stateless methods // Stateless methods
public static native byte[] gi_to_stream( CurGameInfo gi ); public static native byte[] gi_to_stream( CurGameInfo gi );
public static native void gi_from_stream( CurGameInfo gi, byte[] stream ); public static native void gi_from_stream( CurGameInfo gi, byte[] stream );
public static native void comms_getInitialAddr( CommsAddrRec addr ); public static native void comms_getInitialAddr( CommsAddrRec addr,
String relayHost );
// Game methods // Game methods
public static native int initJNI(); public static native int initJNI();

8
xwords4/common/comms.c
View file

@ -719,14 +719,18 @@ comms_setAddr( CommsCtxt* comms, const CommsAddrRec* addr )
} /* comms_setAddr */ } /* comms_setAddr */
void void
comms_getInitialAddr( CommsAddrRec* addr ) comms_getInitialAddr( CommsAddrRec* addr
#ifdef XWFEATURE_RELAY
, const XP_UCHAR* relayName
#endif
)
{ {
#if defined XWFEATURE_RELAY #if defined XWFEATURE_RELAY
addr->conType = COMMS_CONN_RELAY; /* for temporary ease in debugging */ addr->conType = COMMS_CONN_RELAY; /* for temporary ease in debugging */
addr->u.ip_relay.ipAddr = 0L; /* force 'em to set it */ addr->u.ip_relay.ipAddr = 0L; /* force 'em to set it */
addr->u.ip_relay.port = RELAY_PORT_DEFAULT; addr->u.ip_relay.port = RELAY_PORT_DEFAULT;
{ {
char* name = RELAY_NAME_DEFAULT; const char* name = relayName;
char* room = RELAY_ROOM_DEFAULT; char* room = RELAY_ROOM_DEFAULT;
XP_MEMCPY( addr->u.ip_relay.hostName, name, XP_STRLEN(name)+1 ); XP_MEMCPY( addr->u.ip_relay.hostName, name, XP_STRLEN(name)+1 );
XP_MEMCPY( addr->u.ip_relay.invite, room, XP_STRLEN(room)+1 ); XP_MEMCPY( addr->u.ip_relay.invite, room, XP_STRLEN(room)+1 );

6
xwords4/common/comms.h
View file

@ -149,7 +149,11 @@ void comms_destroy( CommsCtxt* comms );
void comms_setConnID( CommsCtxt* comms, XP_U32 connID ); void comms_setConnID( CommsCtxt* comms, XP_U32 connID );
/* "static" methods work when no comms present */ /* "static" methods work when no comms present */
void comms_getInitialAddr( CommsAddrRec* addr ); void comms_getInitialAddr( CommsAddrRec* addr
#ifdef XWFEATURE_RELAY
, const XP_UCHAR* relayName
#endif
);
XP_Bool comms_checkAddr( DeviceRole role, const CommsAddrRec* addr, XP_Bool comms_checkAddr( DeviceRole role, const CommsAddrRec* addr,
XW_UtilCtxt* util ); XW_UtilCtxt* util );