Skip to content

Commit 1a6f467

Browse files
abstrakraftabstrakraft
committed
Basic support for cwiid_listen
1 parent b54bd05 commit 1a6f467

File tree

4 files changed

+587
-52
lines changed

4 files changed

+587
-52
lines changed

‎libcwiid/connect.c

+165-52
Original file line numberDiff line numberDiff line change
@@ -33,41 +33,14 @@ static int wiimote_id = 0;
3333
/* TODO: Turn this onto a macro on next major so version */
3434
cwiid_wiimote_t *cwiid_open(bdaddr_t *bdaddr, int flags)
3535
{
36-
return cwiid_open_timeout(bdaddr, flags, 5);
36+
return cwiid_open_timeout(bdaddr, flags, DEFAULT_TIMEOUT);
3737
}
3838

3939
cwiid_wiimote_t *cwiid_open_timeout(bdaddr_t *bdaddr, int flags, int timeout)
4040
{
41-
struct wiimote *wiimote = NULL;
4241
struct sockaddr_l2 remote_addr;
43-
char mesg_pipe_init = 0, status_pipe_init = 0, rw_pipe_init = 0,
44-
state_mutex_init = 0, rw_mutex_init = 0, rpt_mutex_init = 0,
45-
router_thread_init = 0, status_thread_init = 0;
46-
void *pthread_ret;
47-
48-
/* Allocate wiimote */
49-
if ((wiimote = malloc(sizeof *wiimote)) == NULL) {
50-
cwiid_err(NULL, "Memory allocation error (cwiid_wiimote_t)");
51-
goto ERR_HND;
52-
}
53-
54-
/* set flags */
55-
wiimote->flags = flags;
56-
57-
/* For error detection */
58-
wiimote->ctl_socket = wiimote->int_socket = -1;
59-
60-
/* Global Lock, Store and Increment wiimote_id */
61-
if (pthread_mutex_lock(&global_mutex)) {
62-
cwiid_err(NULL, "Mutex lock error (global mutex)");
63-
goto ERR_HND;
64-
}
65-
wiimote->id = wiimote_id++;
66-
if (pthread_mutex_unlock(&global_mutex)) {
67-
cwiid_err(wiimote, "Mutex unlock error (global mutex) - "
68-
"deadlock warning");
69-
goto ERR_HND;
70-
}
42+
int ctl_socket = -1, int_socket = -1;
43+
struct wiimote *wiimote = NULL;
7144

7245
/* If BDADDR_ANY is given, find available wiimote */
7346
if (bacmp(bdaddr, BDADDR_ANY) == 0) {
@@ -83,27 +56,178 @@ cwiid_wiimote_t *cwiid_open_timeout(bdaddr_t *bdaddr, int flags, int timeout)
8356
remote_addr.l2_family = AF_BLUETOOTH;
8457
remote_addr.l2_bdaddr = *bdaddr;
8558
remote_addr.l2_psm = htobs(CTL_PSM);
86-
if ((wiimote->ctl_socket =
59+
if ((ctl_socket =
8760
socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1) {
88-
cwiid_err(wiimote, "Socket creation error (control socket)");
61+
cwiid_err(NULL, "Socket creation error (control socket)");
8962
goto ERR_HND;
9063
}
91-
if (connect(wiimote->ctl_socket, (struct sockaddr *)&remote_addr,
64+
if (connect(ctl_socket, (struct sockaddr *)&remote_addr,
9265
sizeof remote_addr)) {
93-
cwiid_err(wiimote, "Socket connect error (control channel)");
66+
cwiid_err(NULL, "Socket connect error (control socket)");
9467
goto ERR_HND;
9568
}
9669

9770
/* Interrupt Channel */
9871
remote_addr.l2_psm = htobs(INT_PSM);
99-
if ((wiimote->int_socket =
72+
if ((int_socket =
10073
socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1) {
101-
cwiid_err(wiimote, "Socket creation error (interrupt socket)");
74+
cwiid_err(NULL, "Socket creation error (interrupt socket)");
10275
goto ERR_HND;
10376
}
104-
if (connect(wiimote->int_socket, (struct sockaddr *)&remote_addr,
77+
if (connect(int_socket, (struct sockaddr *)&remote_addr,
10578
sizeof remote_addr)) {
106-
cwiid_err(wiimote, "Socket connect error (interrupt channel)");
79+
cwiid_err(NULL, "Socket connect error (interrupt socket)");
80+
goto ERR_HND;
81+
}
82+
83+
if ((wiimote = cwiid_new(ctl_socket, int_socket, flags)) == NULL) {
84+
/* Raises its own error */
85+
goto ERR_HND;
86+
}
87+
88+
return wiimote;
89+
90+
ERR_HND:
91+
/* Close Sockets */
92+
if (ctl_socket != -1) {
93+
if (close(ctl_socket)) {
94+
cwiid_err(NULL, "Socket close error (control socket)");
95+
}
96+
}
97+
if (int_socket != -1) {
98+
if (close(int_socket)) {
99+
cwiid_err(NULL, "Socket close error (interrupt socket)");
100+
}
101+
}
102+
return NULL;
103+
}
104+
105+
cwiid_wiimote_t *cwiid_listen(int flags)
106+
{
107+
struct sockaddr_l2 local_addr;
108+
struct sockaddr_l2 remote_addr;
109+
socklen_t socklen;
110+
int ctl_server_socket = -1, int_server_socket = -1,
111+
ctl_socket = -1, int_socket = -1;
112+
struct wiimote *wiimote = NULL;
113+
114+
/* Connect to Wiimote */
115+
/* Control Channel */
116+
memset(&local_addr, 0, sizeof local_addr);
117+
local_addr.l2_family = AF_BLUETOOTH;
118+
local_addr.l2_bdaddr = *BDADDR_ANY;
119+
local_addr.l2_psm = htobs(CTL_PSM);
120+
if ((ctl_server_socket =
121+
socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1) {
122+
cwiid_err(NULL, "Socket creation error (control socket)");
123+
goto ERR_HND;
124+
}
125+
if (bind(ctl_server_socket, (struct sockaddr *)&local_addr,
126+
sizeof local_addr)) {
127+
cwiid_err(NULL, "Socket bind error (control socket)");
128+
goto ERR_HND;
129+
}
130+
if (listen(ctl_server_socket, 1)) {
131+
cwiid_err(NULL, "Socket listen error (control socket)");
132+
goto ERR_HND;
133+
}
134+
135+
/* Interrupt Channel */
136+
local_addr.l2_psm = htobs(INT_PSM);
137+
if ((int_server_socket =
138+
socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1) {
139+
cwiid_err(NULL, "Socket creation error (interrupt socket)");
140+
goto ERR_HND;
141+
}
142+
if (bind(int_server_socket, (struct sockaddr *)&local_addr,
143+
sizeof local_addr)) {
144+
cwiid_err(NULL, "Socket bind error (interrupt socket)");
145+
goto ERR_HND;
146+
}
147+
if (listen(int_server_socket, 1)) {
148+
cwiid_err(NULL, "Socket listen error (interrupt socket)");
149+
goto ERR_HND;
150+
}
151+
152+
/* Block for Connections */
153+
if ((ctl_socket = accept(ctl_server_socket, (struct sockaddr *)&remote_addr, &socklen)) < 0) {
154+
cwiid_err(NULL, "Socket accept error (control socket)");
155+
goto ERR_HND;
156+
}
157+
if ((int_socket = accept(int_server_socket, (struct sockaddr *)&remote_addr, &socklen)) < 0) {
158+
cwiid_err(NULL, "Socket accept error (interrupt socket)");
159+
goto ERR_HND;
160+
}
161+
162+
/* Close server sockets */
163+
if (close(ctl_server_socket)) {
164+
cwiid_err(NULL, "Socket close error (control socket)");
165+
}
166+
if (close(int_server_socket)) {
167+
cwiid_err(NULL, "Socket close error (interrupt socket)");
168+
}
169+
170+
if ((wiimote = cwiid_new(ctl_socket, int_socket, flags)) == NULL) {
171+
/* Raises its own error */
172+
goto ERR_HND;
173+
}
174+
175+
return wiimote;
176+
177+
ERR_HND:
178+
/* Close Sockets */
179+
if (ctl_server_socket != -1) {
180+
if (close(ctl_server_socket)) {
181+
cwiid_err(NULL, "Socket close error (control server socket)");
182+
}
183+
}
184+
if (int_server_socket != -1) {
185+
if (close(int_server_socket)) {
186+
cwiid_err(NULL, "Socket close error (interrupt server socket)");
187+
}
188+
}
189+
if (ctl_socket != -1) {
190+
if (close(ctl_socket)) {
191+
cwiid_err(NULL, "Socket close error (control socket)");
192+
}
193+
}
194+
if (int_socket != -1) {
195+
if (close(int_socket)) {
196+
cwiid_err(NULL, "Socket close error (interrupt socket)");
197+
}
198+
}
199+
200+
return NULL;
201+
}
202+
203+
cwiid_wiimote_t *cwiid_new(int ctl_socket, int int_socket, int flags)
204+
{
205+
struct wiimote *wiimote = NULL;
206+
char mesg_pipe_init = 0, status_pipe_init = 0, rw_pipe_init = 0,
207+
state_mutex_init = 0, rw_mutex_init = 0, rpt_mutex_init = 0,
208+
router_thread_init = 0, status_thread_init = 0;
209+
void *pthread_ret;
210+
211+
/* Allocate wiimote */
212+
if ((wiimote = malloc(sizeof *wiimote)) == NULL) {
213+
cwiid_err(NULL, "Memory allocation error (cwiid_wiimote_t)");
214+
goto ERR_HND;
215+
}
216+
217+
/* set sockets and flags */
218+
wiimote->ctl_socket = ctl_socket;
219+
wiimote->int_socket = int_socket;
220+
wiimote->flags = flags;
221+
222+
/* Global Lock, Store and Increment wiimote_id */
223+
if (pthread_mutex_lock(&global_mutex)) {
224+
cwiid_err(NULL, "Mutex lock error (global mutex)");
225+
goto ERR_HND;
226+
}
227+
wiimote->id = wiimote_id++;
228+
if (pthread_mutex_unlock(&global_mutex)) {
229+
cwiid_err(wiimote, "Mutex unlock error (global mutex) - "
230+
"deadlock warning");
107231
goto ERR_HND;
108232
}
109233

@@ -156,7 +280,7 @@ cwiid_wiimote_t *cwiid_open_timeout(bdaddr_t *bdaddr, int flags, int timeout)
156280
/* Set rw_status before starting router thread */
157281
wiimote->rw_status = RW_IDLE;
158282

159-
/* Launch interrupt channel listener and dispatch threads */
283+
/* Launch interrupt socket listener and dispatch threads */
160284
if (pthread_create(&wiimote->router_thread, NULL,
161285
(void *(*)(void *))&router_thread, wiimote)) {
162286
cwiid_err(wiimote, "Thread creation error (router thread)");
@@ -202,17 +326,6 @@ cwiid_wiimote_t *cwiid_open_timeout(bdaddr_t *bdaddr, int flags, int timeout)
202326
}
203327
}
204328

205-
/* Close Sockets */
206-
if (wiimote->int_socket != -1) {
207-
if (close(wiimote->int_socket)) {
208-
cwiid_err(wiimote, "Socket close error (interrupt channel)");
209-
}
210-
}
211-
if (wiimote->ctl_socket != -1) {
212-
if (close(wiimote->ctl_socket)) {
213-
cwiid_err(wiimote, "Socket close error (control channel)");
214-
}
215-
}
216329
/* Close Pipes */
217330
if (mesg_pipe_init) {
218331
if (close(wiimote->mesg_pipe[0]) || close(wiimote->mesg_pipe[1])) {
@@ -296,10 +409,10 @@ int cwiid_close(cwiid_wiimote_t *wiimote)
296409

297410
/* Close sockets */
298411
if (close(wiimote->int_socket)) {
299-
cwiid_err(wiimote, "Socket close error (interrupt channel)");
412+
cwiid_err(wiimote, "Socket close error (interrupt socket)");
300413
}
301414
if (close(wiimote->ctl_socket)) {
302-
cwiid_err(wiimote, "Socket close error (control channel)");
415+
cwiid_err(wiimote, "Socket close error (control socket)");
303416
}
304417
/* Close Pipes */
305418
if (close(wiimote->mesg_pipe[0]) || close(wiimote->mesg_pipe[1])) {

‎libcwiid/cwiid.h

+1
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ void cwiid_err_default(struct wiimote *wiimote, const char *str, va_list ap);
323323
#define cwiid_disconnect cwiid_close
324324
cwiid_wiimote_t *cwiid_open(bdaddr_t *bdaddr, int flags);
325325
cwiid_wiimote_t *cwiid_open_timeout(bdaddr_t *bdaddr, int flags, int timeout);
326+
cwiid_wiimote_t *cwiid_listen(int flags);
326327
int cwiid_close(cwiid_wiimote_t *wiimote);
327328

328329
int cwiid_get_id(cwiid_wiimote_t *wiimote);

‎libcwiid/cwiid_internal.h

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
#include <sys/types.h> /* ssize_t */
2525
#include "cwiid.h"
2626

27+
#define DEFAULT_TIMEOUT 5
28+
2729
/* Bluetooth magic numbers */
2830
#define BT_TRANS_MASK 0xF0
2931
#define BT_TRANS_HANDSHAKE 0x00
@@ -174,6 +176,8 @@ struct wiimote {
174176
};
175177

176178
/* prototypes */
179+
cwiid_wiimote_t *cwiid_new(int ctl_socket, int int_socket, int flags);
180+
177181
/* thread.c */
178182
void *router_thread(struct wiimote *wiimote);
179183
void *status_thread(struct wiimote *wiimote);

0 commit comments

Comments
 (0)