Stop sharing sockets!

Author: Zarithya

gc/bte/bte.h

@@ -164,6 +164,7 @@ void BTE_WriteStoredLinkKey(struct bd_addr *bdaddr,u8 *key);
 void BTE_ClearStoredLinkKeys(void);
 
 struct bte_pcb* bte_new(void);
+void bte_free(struct bte_pcb *pcb);
 void bte_arg(struct bte_pcb *pcb,void *arg);
 void bte_received(struct bte_pcb *pcb, s32 (*recv)(void *arg,void *buffer,u16 len));
 void bte_disconnected(struct bte_pcb *pcb,s32 (disconn_cfm)(void *arg,struct bte_pcb *pcb,u8 err));

lwbt/bte.c

@@ -645,6 +645,14 @@ struct bte_pcb* bte_new(void)
 	return pcb;
 }
 
+void bte_free(struct bte_pcb *pcb)
+{
+	if(pcb==NULL) return;
+	
+	LWP_CloseQueue(pcb->cmdq);
+	btmemb_free(&bte_pcbs, pcb);
+}
+
 s32 bte_registerdeviceasync(struct bte_pcb *pcb,struct bd_addr *bdaddr,s32 (*conn_cfm)(void *arg,struct bte_pcb *pcb,u8 err))
 {
 	u32 level;

wiiuse/io_wii.c

@@ -53,6 +53,9 @@ static s32 __wiiuse_disconnected(void *arg,struct bte_pcb *pcb,u8 err)
 
 	if(wm->event_cb) wm->event_cb(wm,WIIUSE_DISCONNECT);
 
+	bte_free(wml->sock);
+	wml->sock = NULL;
+	
 	wml->wm = NULL;
 	return ERR_OK;
 }
@@ -134,7 +137,11 @@ int wiiuse_register(struct wiimote_listen_t *wml, struct bd_addr *bdaddr, struct
 		wml->sock = bte_new();
 	}
 	else
+	{
 		printf("err: %d / state: %d / bdaddr: %02x:%02x:%02x:%02x:%02x:%02x\n", wml->sock->err, wml->sock->state, wml->sock->bdaddr.addr[5], wml->sock->bdaddr.addr[4], wml->sock->bdaddr.addr[3], wml->sock->bdaddr.addr[2], wml->sock->bdaddr.addr[1], wml->sock->bdaddr.addr[0]);
+		bte_free(wml->sock);
+		wml->sock = bte_new();
+	}
 
 	bte_arg(wml->sock,wml);
 	bte_received(wml->sock,__wiiuse_receive);

wiiuse/wpad.c

@@ -958,7 +958,8 @@ static s8 __wpad_connreqCB(void *arg,struct bd_addr *pad_addr,u8 *cod,u8 link_ty
 	// Only accept connection requests (i.e. "press any button") if not doing guest pairing
 	if(BTE_GetPairMode() == PAIR_MODE_NORMAL) {
 		if(!bd_addr_cmp(pad_addr,BD_ADDR_ANY)) {
-			__lwp_thread_dispatchdisable();
+			_CPU_ISR_Disable(level);
+			//__lwp_thread_dispatchdisable();
 			for(i=0; i<CONF_PAD_MAX_ACTIVE; i++) {
 				BD_ADDR_FROM_BYTES(&bdaddr,__wpad_devs.active[i].bdaddr);
 				if(bd_addr_cmp(pad_addr,&bdaddr)) {
@@ -1003,13 +1004,16 @@ static s8 __wpad_connreqCB(void *arg,struct bd_addr *pad_addr,u8 *cod,u8 link_ty
 
 			if(slot < CONF_PAD_MAX_ACTIVE) {
 				__wpads_used |= (0x01<<slot);
+				printf("Assigning slot %d\n",slot);
 				wiiuse_register(&__wpads_listen[slot],pad_addr,__wpad_assign_slot);
-				__lwp_thread_dispatchunnest();
+				_CPU_ISR_Restore(level);
+				//__lwp_thread_dispatchunnest();
 				return ERR_OK;
 			}
 			else
 			{
-				__lwp_thread_dispatchunnest();
+				_CPU_ISR_Restore(level);
+				//__lwp_thread_dispatchunnest();
 			}
 		}
 
@@ -1702,16 +1706,18 @@ s32 WPAD_Shutdown(void)
 	for(i=0;i<WPAD_MAX_DEVICES;i++) {
 		wpdcb = &__wpdcb[i];
 		SYS_RemoveAlarm(wpdcb->sound_alarm);
+		bte_free(__wpads_listen[i].sock);
+		__wpads_listen[i].sock = NULL;
 		//__wpad_disconnect(wpdcb);
 	}
 
 	__wiiuse_sensorbar_enable(0);
 	_CPU_ISR_Restore(level);
 
-	while(__wpads_used) {
+	/*while(__wpads_used) {
 		usleep(50);
 		if(++cnt > 3000) break;
-	}
+	}*/
 
 	BTE_Shutdown();