author | paule <paule> | 2007-07-16 09:38:45 (UTC) |
---|---|---|
committer | paule <paule> | 2007-07-16 09:38:45 (UTC) |
commit | 6e556a6cd6b4edf2abcf08a657c9f0b19a0fca76 (patch) (unidiff) | |
tree | de3724f66caa45e5fee614c22494587657093de8 | |
parent | 15fbd2a9189281ca84d89ad6a77261d0046add36 (diff) | |
download | opie-6e556a6cd6b4edf2abcf08a657c9f0b19a0fca76.zip opie-6e556a6cd6b4edf2abcf08a657c9f0b19a0fca76.tar.gz opie-6e556a6cd6b4edf2abcf08a657c9f0b19a0fca76.tar.bz2 |
Commit "thanks-pfalcon-this-one-is-better.patch" as attached to bug #1854. This fixes libopieobex previously being built without being linked to libopenobex, as well as some other issues that prevented IR recieve from working.upstream
Original patch by Marek Vasut <marek.vasut@gmail.com>; improved with input from pfalcon & polyonymous.
-rw-r--r-- | core/obex/obex.pro | 4 | ||||
-rw-r--r-- | core/obex/obexserver.cpp | 28 |
2 files changed, 19 insertions, 13 deletions
diff --git a/core/obex/obex.pro b/core/obex/obex.pro index 05118ab..2372d12 100644 --- a/core/obex/obex.pro +++ b/core/obex/obex.pro | |||
@@ -1,24 +1,24 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | HEADERS= obex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obexserver.h | 3 | HEADERS= obex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obexserver.h |
4 | SOURCES= obex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp | 4 | SOURCES= obex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp |
5 | TARGET = opieobex | 5 | TARGET = opieobex |
6 | DESTDIR = $(OPIEDIR)/plugins/obex | 6 | DESTDIR = $(OPIEDIR)/plugins/obex |
7 | INTERFACES = obexsendbase.ui | 7 | INTERFACES = obexsendbase.ui |
8 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher | 8 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher |
9 | DEPENDPATH += | 9 | DEPENDPATH += |
10 | LIBS += -lqpe -lopiecore2 | 10 | LIBS += -lqpe -lopiecore2 -lopenobex |
11 | VERSION = 0.0.4 | 11 | VERSION = 0.0.4 |
12 | 12 | ||
13 | include( $(OPIEDIR)/include.pro ) | 13 | include( $(OPIEDIR)/include.pro ) |
14 | target.path = $$prefix/plugins/applets | 14 | target.path = $$prefix/plugins/applets |
15 | 15 | ||
16 | #FIXME: These parameters are used if bluetooth is used | 16 | #FIXME: These parameters are used if bluetooth is used |
17 | CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH ) | 17 | CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH ) |
18 | contains( CONFTEST, y ){ | 18 | contains( CONFTEST, y ){ |
19 | HEADERS += btobex.h | 19 | HEADERS += btobex.h |
20 | SOURCES += btobex.cpp | 20 | SOURCES += btobex.cpp |
21 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 21 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
22 | LIBS += -lopietooth1 -lbluetooth -lopenobex | 22 | LIBS += -lopietooth1 -lbluetooth |
23 | DEFINES += BLUETOOTH | 23 | DEFINES += BLUETOOTH |
24 | } | 24 | } |
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index f1fb205..59fcb0f 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp | |||
@@ -114,193 +114,205 @@ static int put_done(obex_t* handle, obex_object_t* object) | |||
114 | case OBEX_HDR_BODY: | 114 | case OBEX_HDR_BODY: |
115 | body = hv.bs; | 115 | body = hv.bs; |
116 | body_len = hlen; | 116 | body_len = hlen; |
117 | break; | 117 | break; |
118 | 118 | ||
119 | case OBEX_HDR_NAME: | 119 | case OBEX_HDR_NAME: |
120 | name = new uint8_t[(hlen / 2) + 1]; | 120 | name = new uint8_t[(hlen / 2) + 1]; |
121 | OBEX_UnicodeToChar(name, hv.bs, hlen); | 121 | OBEX_UnicodeToChar(name, hv.bs, hlen); |
122 | break; | 122 | break; |
123 | 123 | ||
124 | default: | 124 | default: |
125 | break; | 125 | break; |
126 | } | 126 | } |
127 | } | 127 | } |
128 | 128 | ||
129 | if (body) | 129 | if (body) |
130 | err = file_received(name, body, body_len); | 130 | err = file_received(name, body, body_len); |
131 | 131 | ||
132 | if (name) | 132 | if (name) |
133 | delete[] name; | 133 | delete[] name; |
134 | return err; | 134 | return err; |
135 | } | 135 | } |
136 | 136 | ||
137 | /** | 137 | /** |
138 | * Function handles OBEX request | 138 | * Function handles OBEX request |
139 | * @param handle OBEX connection handle | 139 | * @param handle OBEX connection handle |
140 | * @param object OBEX object itself | 140 | * @param object OBEX object itself |
141 | * @param mode | 141 | * @param mode |
142 | * @param event event code | 142 | * @param event event code |
143 | * @param cmd OBEX command itself | 143 | * @param cmd OBEX command itself |
144 | */ | 144 | */ |
145 | static void handle_request (obex_t* handle, obex_object_t* object, | 145 | static void handle_request (obex_t* handle, obex_object_t* object, |
146 | int event, int cmd) | 146 | int event, int cmd) |
147 | { | 147 | { |
148 | (void)event; | 148 | (void)event; |
149 | switch(cmd){ | 149 | switch(cmd){ |
150 | case OBEX_CMD_SETPATH: | 150 | case OBEX_CMD_SETPATH: |
151 | OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); | 151 | OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); |
152 | break; | 152 | break; |
153 | case OBEX_CMD_PUT: | 153 | case OBEX_CMD_PUT: |
154 | if (put_done (handle, object) < 0) | 154 | if (put_done (handle, object) < 0) |
155 | OBEX_ObjectSetRsp (object, OBEX_RSP_INTERNAL_SERVER_ERROR, | 155 | OBEX_ObjectSetRsp (object, OBEX_RSP_INTERNAL_SERVER_ERROR, |
156 | OBEX_RSP_INTERNAL_SERVER_ERROR); | 156 | OBEX_RSP_INTERNAL_SERVER_ERROR); |
157 | else | 157 | else |
158 | OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); | 158 | OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); |
159 | break; | 159 | break; |
160 | case OBEX_CMD_CONNECT: | 160 | case OBEX_CMD_CONNECT: |
161 | OBEX_ObjectSetRsp (object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS); | 161 | OBEX_ObjectSetRsp (object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS); |
162 | break; | 162 | break; |
163 | case OBEX_CMD_DISCONNECT: | 163 | case OBEX_CMD_DISCONNECT: |
164 | OBEX_ObjectSetRsp (object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS); | 164 | OBEX_ObjectSetRsp (object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS); |
165 | break; | 165 | break; |
166 | default: | 166 | default: |
167 | printf("Denied %02x request\n", cmd); | 167 | printf("Denied %02x request\n", cmd); |
168 | fflush(stdout); | 168 | fflush(stdout); |
169 | OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, | 169 | OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, |
170 | OBEX_RSP_NOT_IMPLEMENTED); | 170 | OBEX_RSP_NOT_IMPLEMENTED); |
171 | break; | 171 | break; |
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | 175 | ||
176 | /** | 176 | /** |
177 | * Function handles OBEX event when a client is connected to the server | 177 | * Function handles OBEX event when a client is connected to the server |
178 | * @param handle OBEX connection handle | 178 | * @param handle OBEX connection handle |
179 | * @param object OBEX object itself | 179 | * @param object OBEX object itself |
180 | * @param mode | 180 | * @param mode |
181 | * @param event event code | 181 | * @param event event code |
182 | * @param obex_cmd OBEX command itself | 182 | * @param obex_cmd OBEX command itself |
183 | * @param obex_rsp OBEX responce | 183 | * @param obex_rsp OBEX responce |
184 | */ | 184 | */ |
185 | static void obex_conn_event (obex_t *handle, obex_object_t *object, | 185 | static void obex_conn_event (obex_t *handle, obex_object_t *object, |
186 | int mode, int event, int obex_cmd, int obex_rsp) | 186 | int mode, int event, int obex_cmd, int obex_rsp) |
187 | { | 187 | { |
188 | (void)mode; | 188 | (void)mode; |
189 | (void)obex_rsp; | 189 | (void)obex_rsp; |
190 | 190 | ||
191 | switch(event) { | 191 | switch(event) { |
192 | case OBEX_EV_REQHINT: | 192 | case OBEX_EV_REQHINT: |
193 | switch(obex_cmd) { | 193 | switch(obex_cmd) { |
194 | case OBEX_CMD_PUT: | 194 | case OBEX_CMD_PUT: |
195 | case OBEX_CMD_CONNECT: | 195 | case OBEX_CMD_CONNECT: |
196 | case OBEX_CMD_DISCONNECT: | 196 | case OBEX_CMD_DISCONNECT: |
197 | OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); | 197 | OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); |
198 | break; | 198 | break; |
199 | default: | 199 | default: |
200 | OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, | 200 | OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, |
201 | OBEX_RSP_NOT_IMPLEMENTED); | 201 | OBEX_RSP_NOT_IMPLEMENTED); |
202 | break; | 202 | break; |
203 | } | 203 | } |
204 | break; | 204 | break; |
205 | 205 | ||
206 | case OBEX_EV_REQ: | 206 | case OBEX_EV_REQ: |
207 | /* Comes when a server-request has been received. */ | 207 | /* Comes when a server-request has been received. */ |
208 | handle_request (handle, object, event, obex_cmd); | 208 | handle_request (handle, object, event, obex_cmd); |
209 | break; | 209 | break; |
210 | 210 | case OBEX_EV_REQDONE: | |
211 | switch(obex_cmd) { | ||
212 | case OBEX_CMD_PUT: | ||
213 | case OBEX_CMD_CONNECT: | ||
214 | break; | ||
215 | case OBEX_CMD_DISCONNECT: | ||
216 | OBEX_TransportDisconnect(handle); | ||
217 | _exit(0); | ||
218 | break; | ||
219 | default: | ||
220 | break; | ||
221 | } | ||
222 | break; | ||
211 | case OBEX_EV_LINKERR: | 223 | case OBEX_EV_LINKERR: |
212 | break; | 224 | break; |
213 | } | 225 | } |
214 | } | 226 | } |
215 | 227 | ||
216 | /** | 228 | /** |
217 | * Function handles OBEX event | 229 | * Function handles OBEX event |
218 | * @param handle OBEX connection handle | 230 | * @param handle OBEX connection handle |
219 | * @param object OBEX object itself | 231 | * @param object OBEX object itself |
220 | * @param mode | 232 | * @param mode |
221 | * @param event event code | 233 | * @param event event code |
222 | * @param obex_cmd OBEX command itself | 234 | * @param obex_cmd OBEX command itself |
223 | * @param obex_rsp OBEX responce | 235 | * @param obex_rsp OBEX responce |
224 | */ | 236 | */ |
225 | static void obex_event (obex_t* handle, obex_object_t* object, int mode, | 237 | static void obex_event (obex_t* handle, obex_object_t* object, int mode, |
226 | int event, int obex_cmd, int obex_rsp) | 238 | int event, int obex_cmd, int obex_rsp) |
227 | { | 239 | { |
228 | 240 | ||
229 | obex_t *obex; //OBEX connection handle | 241 | obex_t *obex; //OBEX connection handle |
230 | 242 | ||
231 | switch (event) { | 243 | switch (event) { |
232 | case OBEX_EV_ACCEPTHINT: | 244 | case OBEX_EV_ACCEPTHINT: |
233 | obex = OBEX_ServerAccept (handle, obex_conn_event, NULL); | 245 | obex = OBEX_ServerAccept (handle, obex_conn_event, NULL); |
234 | break; | 246 | break; |
235 | 247 | ||
236 | default: | 248 | default: |
237 | obex_conn_event(handle, object, mode, event, obex_cmd, obex_rsp); | 249 | obex_conn_event(handle, object, mode, event, obex_cmd, obex_rsp); |
238 | } | 250 | } |
239 | } | 251 | } |
240 | 252 | ||
241 | /** | 253 | /** |
242 | * Function registers OBEX push service on a specified channel | 254 | * Function registers OBEX push service on a specified channel |
243 | * Based on The same function from GPE. | 255 | * Based on The same function from GPE. |
244 | * @param session SDP session | 256 | * @param session SDP session |
245 | * @param chan channel to listen | 257 | * @param chan channel to listen |
246 | * @name name to show | 258 | * @name name to show |
247 | */ | 259 | */ |
248 | sdp_session_t* ObexServer::addOpushSvc(uint8_t chan, const char* name) | 260 | sdp_session_t* ObexServer::addOpushSvc(uint8_t chan, const char* name) |
249 | { | 261 | { |
250 | sdp_list_t *svclass_id, *pfseq, *apseq, *root; | 262 | sdp_list_t *svclass_id, *pfseq, *apseq, *root; |
251 | uuid_t root_uuid, opush_uuid, l2cap_uuid, rfcomm_uuid, obex_uuid; | 263 | uuid_t root_uuid, opush_uuid, l2cap_uuid, rfcomm_uuid, obex_uuid; |
252 | sdp_profile_desc_t profile[1]; | 264 | sdp_profile_desc_t profile[1]; |
253 | sdp_list_t *aproto, *proto[3]; | 265 | sdp_list_t *aproto, *proto[3]; |
254 | sdp_record_t record; | 266 | sdp_record_t record; |
255 | sdp_data_t *channel; | 267 | sdp_data_t *channel; |
256 | uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 }; | 268 | uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 }; |
257 | //uint8_t formats[] = { 0xff }; | 269 | //uint8_t formats[] = { 0xff }; |
258 | void *dtds[sizeof(formats)], *values[sizeof(formats)]; | 270 | void *dtds[sizeof(formats)], *values[sizeof(formats)]; |
259 | unsigned int i; | 271 | unsigned int i; |
260 | uint8_t dtd = SDP_UINT8; | 272 | uint8_t dtd = SDP_UINT8; |
261 | sdp_data_t *sflist; | 273 | sdp_data_t *sflist; |
262 | int err = 0; | 274 | int err = 0; |
263 | sdp_session_t* lsession = 0; | 275 | sdp_session_t* lsession = 0; |
264 | 276 | ||
265 | memset((void *)&record, 0, sizeof(sdp_record_t)); | 277 | memset((void *)&record, 0, sizeof(sdp_record_t)); |
266 | record.handle = 0xffffffff; | 278 | record.handle = 0xffffffff; |
267 | sdp_uuid16_create(&root_uuid, PUBLIC_BROWSE_GROUP); | 279 | sdp_uuid16_create(&root_uuid, PUBLIC_BROWSE_GROUP); |
268 | root = sdp_list_append(0, &root_uuid); | 280 | root = sdp_list_append(0, &root_uuid); |
269 | sdp_set_browse_groups(&record, root); | 281 | sdp_set_browse_groups(&record, root); |
270 | 282 | ||
271 | sdp_uuid16_create(&opush_uuid, OBEX_OBJPUSH_SVCLASS_ID); | 283 | sdp_uuid16_create(&opush_uuid, OBEX_OBJPUSH_SVCLASS_ID); |
272 | svclass_id = sdp_list_append(0, &opush_uuid); | 284 | svclass_id = sdp_list_append(0, &opush_uuid); |
273 | sdp_set_service_classes(&record, svclass_id); | 285 | sdp_set_service_classes(&record, svclass_id); |
274 | 286 | ||
275 | sdp_uuid16_create(&profile[0].uuid, OBEX_OBJPUSH_PROFILE_ID); | 287 | sdp_uuid16_create(&profile[0].uuid, OBEX_OBJPUSH_PROFILE_ID); |
276 | profile[0].version = 0x0100; | 288 | profile[0].version = 0x0100; |
277 | pfseq = sdp_list_append(0, profile); | 289 | pfseq = sdp_list_append(0, profile); |
278 | sdp_set_profile_descs(&record, pfseq); | 290 | sdp_set_profile_descs(&record, pfseq); |
279 | 291 | ||
280 | sdp_uuid16_create(&l2cap_uuid, L2CAP_UUID); | 292 | sdp_uuid16_create(&l2cap_uuid, L2CAP_UUID); |
281 | proto[0] = sdp_list_append(0, &l2cap_uuid); | 293 | proto[0] = sdp_list_append(0, &l2cap_uuid); |
282 | apseq = sdp_list_append(0, proto[0]); | 294 | apseq = sdp_list_append(0, proto[0]); |
283 | 295 | ||
284 | sdp_uuid16_create(&rfcomm_uuid, RFCOMM_UUID); | 296 | sdp_uuid16_create(&rfcomm_uuid, RFCOMM_UUID); |
285 | proto[1] = sdp_list_append(0, &rfcomm_uuid); | 297 | proto[1] = sdp_list_append(0, &rfcomm_uuid); |
286 | channel = sdp_data_alloc(SDP_UINT8, &chan); | 298 | channel = sdp_data_alloc(SDP_UINT8, &chan); |
287 | proto[1] = sdp_list_append(proto[1], channel); | 299 | proto[1] = sdp_list_append(proto[1], channel); |
288 | apseq = sdp_list_append(apseq, proto[1]); | 300 | apseq = sdp_list_append(apseq, proto[1]); |
289 | 301 | ||
290 | sdp_uuid16_create(&obex_uuid, OBEX_UUID); | 302 | sdp_uuid16_create(&obex_uuid, OBEX_UUID); |
291 | proto[2] = sdp_list_append(0, &obex_uuid); | 303 | proto[2] = sdp_list_append(0, &obex_uuid); |
292 | apseq = sdp_list_append(apseq, proto[2]); | 304 | apseq = sdp_list_append(apseq, proto[2]); |
293 | 305 | ||
294 | aproto = sdp_list_append(0, apseq); | 306 | aproto = sdp_list_append(0, apseq); |
295 | sdp_set_access_protos(&record, aproto); | 307 | sdp_set_access_protos(&record, aproto); |
296 | 308 | ||
297 | for (i = 0; i < sizeof(formats); i++) | 309 | for (i = 0; i < sizeof(formats); i++) |
298 | { | 310 | { |
299 | dtds[i] = &dtd; | 311 | dtds[i] = &dtd; |
300 | values[i] = &formats[i]; | 312 | values[i] = &formats[i]; |
301 | } | 313 | } |
302 | sflist = sdp_seq_alloc(dtds, values, sizeof(formats)); | 314 | sflist = sdp_seq_alloc(dtds, values, sizeof(formats)); |
303 | sdp_attr_add(&record, SDP_ATTR_SUPPORTED_FORMATS_LIST, sflist); | 315 | sdp_attr_add(&record, SDP_ATTR_SUPPORTED_FORMATS_LIST, sflist); |
304 | 316 | ||
305 | sdp_set_info_attr(&record, name, 0, 0); | 317 | sdp_set_info_attr(&record, name, 0, 0); |
306 | 318 | ||
@@ -330,189 +342,183 @@ int ObexServer::initObex(void) | |||
330 | int channel = 10; //Channel on which we do listen | 342 | int channel = 10; //Channel on which we do listen |
331 | if (m_obex) | 343 | if (m_obex) |
332 | return 0; | 344 | return 0; |
333 | m_obex = ::OBEX_Init(transport, obex_event, 0); | 345 | m_obex = ::OBEX_Init(transport, obex_event, 0); |
334 | if (!m_obex) { | 346 | if (!m_obex) { |
335 | printf("OBEX initialization error %d\n", errno); | 347 | printf("OBEX initialization error %d\n", errno); |
336 | return -1; | 348 | return -1; |
337 | } | 349 | } |
338 | if (transport == OBEX_TRANS_BLUETOOTH) { | 350 | if (transport == OBEX_TRANS_BLUETOOTH) { |
339 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); | 351 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); |
340 | m_session = addOpushSvc(channel, "OBEX Object Push"); | 352 | m_session = addOpushSvc(channel, "OBEX Object Push"); |
341 | if (!m_session) { | 353 | if (!m_session) { |
342 | printf("OBEX registration error %d\n", errno); | 354 | printf("OBEX registration error %d\n", errno); |
343 | ::OBEX_Cleanup(m_obex); | 355 | ::OBEX_Cleanup(m_obex); |
344 | m_obex = NULL; | 356 | m_obex = NULL; |
345 | return -1; | 357 | return -1; |
346 | } | 358 | } |
347 | } else if (transport == OBEX_TRANS_IRDA) | 359 | } else if (transport == OBEX_TRANS_IRDA) |
348 | ::IrOBEX_ServerRegister(m_obex, "OBEX"); | 360 | ::IrOBEX_ServerRegister(m_obex, "OBEX"); |
349 | return 0; | 361 | return 0; |
350 | } | 362 | } |
351 | 363 | ||
352 | bool ObexServer::start(RunMode runmode, Communication comm) | 364 | bool ObexServer::start(RunMode runmode, Communication comm) |
353 | { | 365 | { |
354 | if ( runs ) | 366 | if ( runs ) |
355 | { | 367 | { |
356 | return false; // cannot start a process that is already running | 368 | return false; // cannot start a process that is already running |
357 | // or if no executable has been assigned | 369 | // or if no executable has been assigned |
358 | } | 370 | } |
359 | run_mode = runmode; | 371 | run_mode = runmode; |
360 | status = 0; | 372 | status = 0; |
361 | 373 | ||
362 | if ( !setupCommunication( comm ) ) | 374 | if ( !setupCommunication( comm ) ) |
363 | qWarning( "Could not setup Communication!" ); | 375 | qWarning( "Could not setup Communication!" ); |
364 | 376 | ||
365 | // We do this in the parent because if we do it in the child process | 377 | // We do this in the parent because if we do it in the child process |
366 | // gdb gets confused when the application runs from gdb. | 378 | // gdb gets confused when the application runs from gdb. |
367 | uid_t uid = getuid(); | 379 | uid_t uid = getuid(); |
368 | gid_t gid = getgid(); | 380 | gid_t gid = getgid(); |
369 | #ifdef HAVE_INITGROUPS | 381 | #ifdef HAVE_INITGROUPS |
370 | 382 | ||
371 | struct passwd *pw = getpwuid( uid ); | 383 | struct passwd *pw = getpwuid( uid ); |
372 | #endif | 384 | #endif |
373 | 385 | ||
374 | int fd[ 2 ]; | 386 | int fd[ 2 ]; |
375 | if ( 0 > pipe( fd ) ) | 387 | if ( 0 > pipe( fd ) ) |
376 | { | 388 | { |
377 | fd[ 0 ] = fd[ 1 ] = 0; // Pipe failed.. continue | 389 | fd[ 0 ] = fd[ 1 ] = 0; // Pipe failed.. continue |
378 | } | 390 | } |
379 | 391 | ||
380 | runs = true; | 392 | runs = true; |
381 | 393 | ||
382 | QApplication::flushX(); | 394 | QApplication::flushX(); |
383 | 395 | ||
384 | // WABA: Note that we use fork() and not vfork() because | 396 | // WABA: Note that we use fork() and not vfork() because |
385 | // vfork() has unclear semantics and is not standardized. | 397 | // vfork() has unclear semantics and is not standardized. |
386 | pid_ = fork(); | 398 | pid_ = fork(); |
387 | 399 | ||
388 | if ( 0 == pid_ ) | 400 | if ( 0 == pid_ ) |
389 | { | 401 | { |
390 | if ( fd[ 0 ] ) | 402 | if ( fd[ 0 ] ) |
391 | close( fd[ 0 ] ); | 403 | close( fd[ 0 ] ); |
392 | if ( !runPrivileged() ) | 404 | if ( !runPrivileged() ) |
393 | { | 405 | { |
394 | setgid( gid ); | 406 | setgid( gid ); |
395 | #if defined( HAVE_INITGROUPS) | 407 | #if defined( HAVE_INITGROUPS) |
396 | 408 | ||
397 | if ( pw ) | 409 | if ( pw ) |
398 | initgroups( pw->pw_name, pw->pw_gid ); | 410 | initgroups( pw->pw_name, pw->pw_gid ); |
399 | #endif | 411 | #endif |
400 | 412 | ||
401 | setuid( uid ); | 413 | setuid( uid ); |
402 | } | 414 | } |
403 | // The child process | 415 | // The child process |
404 | if ( !commSetupDoneC() ) | 416 | if ( !commSetupDoneC() ) |
405 | qWarning( "Could not finish comm setup in child!" ); | 417 | qWarning( "Could not finish comm setup in child!" ); |
406 | 418 | ||
407 | setupEnvironment(); | 419 | setupEnvironment(); |
408 | 420 | ||
409 | // Matthias | 421 | // Matthias |
410 | if ( run_mode == DontCare ) | 422 | if ( run_mode == DontCare ) |
411 | setpgid( 0, 0 ); | 423 | setpgid( 0, 0 ); |
412 | // restore default SIGPIPE handler (Harri) | 424 | // restore default SIGPIPE handler (Harri) |
413 | struct sigaction act; | 425 | struct sigaction act; |
414 | sigemptyset( &( act.sa_mask ) ); | 426 | sigemptyset( &( act.sa_mask ) ); |
415 | sigaddset( &( act.sa_mask ), SIGPIPE ); | 427 | sigaddset( &( act.sa_mask ), SIGPIPE ); |
416 | act.sa_handler = SIG_DFL; | 428 | act.sa_handler = SIG_DFL; |
417 | act.sa_flags = 0; | 429 | act.sa_flags = 0; |
418 | sigaction( SIGPIPE, &act, 0L ); | 430 | sigaction( SIGPIPE, &act, 0L ); |
419 | 431 | ||
420 | // We set the close on exec flag. | 432 | // We set the close on exec flag. |
421 | // Closing of fd[1] indicates that the execvp succeeded! | 433 | // Closing of fd[1] indicates that the execvp succeeded! |
422 | if ( fd[ 1 ] ) | 434 | if ( fd[ 1 ] ) |
423 | fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); | 435 | fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); |
424 | 436 | ||
425 | if (initObex() == 0) { | 437 | if (initObex() == 0) { |
426 | do { | ||
427 | int result; //Connection result | ||
428 | if ( fd[ 1 ] ) { | 438 | if ( fd[ 1 ] ) { |
429 | ::close(fd[1]); | 439 | ::close(fd[1]); |
430 | fd[1] = 0; | 440 | fd[1] = 0; |
431 | } | 441 | } |
432 | if ((result = OBEX_HandleInput(m_obex, 60)) < 0) { | 442 | do { |
433 | if (errno != ECONNRESET) { | 443 | if (OBEX_HandleInput(m_obex, 60) < 0) { |
434 | printf("OBEX_HandleInput error %d\n", errno); | 444 | fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n",errno); |
435 | fflush(stdout); | 445 | _exit(errno?errno:-1); |
436 | _exit(-1); | ||
437 | } | ||
438 | else | ||
439 | _exit(0); | ||
440 | } | 446 | } |
441 | } while(1); | 447 | } while(1); |
442 | } | 448 | } |
443 | char resultByte = 1; | 449 | char resultByte = 1; |
444 | if ( fd[ 1 ] ) | 450 | if ( fd[ 1 ] ) |
445 | write( fd[ 1 ], &resultByte, 1 ); | 451 | write( fd[ 1 ], &resultByte, 1 ); |
446 | _exit( -1 ); | 452 | _exit( -1 ); |
447 | } | 453 | } |
448 | else if ( -1 == pid_ ) | 454 | else if ( -1 == pid_ ) |
449 | { | 455 | { |
450 | // forking failed | 456 | // forking failed |
451 | 457 | ||
452 | runs = false; | 458 | runs = false; |
453 | return false; | 459 | return false; |
454 | } | 460 | } |
455 | else | 461 | else |
456 | { | 462 | { |
457 | if ( fd[ 1 ] ) | 463 | if ( fd[ 1 ] ) |
458 | close( fd[ 1 ] ); | 464 | close( fd[ 1 ] ); |
459 | // the parent continues here | 465 | // the parent continues here |
460 | 466 | ||
461 | // Discard any data for stdin that might still be there | 467 | // Discard any data for stdin that might still be there |
462 | input_data = 0; | 468 | input_data = 0; |
463 | 469 | ||
464 | // Check whether client could be started. | 470 | // Check whether client could be started. |
465 | if ( fd[ 0 ] ) | 471 | if ( fd[ 0 ] ) |
466 | for ( ;; ) | 472 | for ( ;; ) |
467 | { | 473 | { |
468 | char resultByte; | 474 | char resultByte; |
469 | int n = ::read( fd[ 0 ], &resultByte, 1 ); | 475 | int n = ::read( fd[ 0 ], &resultByte, 1 ); |
470 | if ( n == 1 ) | 476 | if ( n == 1 ) |
471 | { | 477 | { |
472 | // Error | 478 | // Error |
473 | runs = false; | 479 | runs = false; |
474 | close( fd[ 0 ] ); | 480 | close( fd[ 0 ] ); |
475 | pid_ = 0; | 481 | pid_ = 0; |
476 | return false; | 482 | return false; |
477 | } | 483 | } |
478 | if ( n == -1 ) | 484 | if ( n == -1 ) |
479 | { | 485 | { |
480 | if ( ( errno == ECHILD ) || ( errno == EINTR ) ) | 486 | if ( ( errno == ECHILD ) || ( errno == EINTR ) ) |
481 | continue; // Ignore | 487 | continue; // Ignore |
482 | } | 488 | } |
483 | break; // success | 489 | break; // success |
484 | } | 490 | } |
485 | if ( fd[ 0 ] ) | 491 | if ( fd[ 0 ] ) |
486 | close( fd[ 0 ] ); | 492 | close( fd[ 0 ] ); |
487 | 493 | ||
488 | if ( !commSetupDoneP() ) // finish communication socket setup for the parent | 494 | if ( !commSetupDoneP() ) // finish communication socket setup for the parent |
489 | qWarning( "Could not finish comm setup in parent!" ); | 495 | qWarning( "Could not finish comm setup in parent!" ); |
490 | 496 | ||
491 | if ( run_mode == Block ) | 497 | if ( run_mode == Block ) |
492 | { | 498 | { |
493 | commClose(); | 499 | commClose(); |
494 | 500 | ||
495 | // The SIGCHLD handler of the process controller will catch | 501 | // The SIGCHLD handler of the process controller will catch |
496 | // the exit and set the status | 502 | // the exit and set the status |
497 | while ( runs ) | 503 | while ( runs ) |
498 | { | 504 | { |
499 | OProcessController::theOProcessController-> | 505 | OProcessController::theOProcessController-> |
500 | slotDoHousekeeping( 0 ); | 506 | slotDoHousekeeping( 0 ); |
501 | } | 507 | } |
502 | runs = FALSE; | 508 | runs = FALSE; |
503 | emit processExited( this ); | 509 | emit processExited( this ); |
504 | } | 510 | } |
505 | } | 511 | } |
506 | return true; | 512 | return true; |
507 | } | 513 | } |
508 | 514 | ||
509 | /* | 515 | /* |
510 | * Stop forwarding process | 516 | * Stop forwarding process |
511 | */ | 517 | */ |
512 | int ObexServer::stop() | 518 | int ObexServer::stop() |
513 | { | 519 | { |
514 | kill(SIGTERM); | 520 | kill(SIGTERM); |
515 | return 0; | 521 | return 0; |
516 | } | 522 | } |
517 | 523 | ||
518 | //eof | 524 | //eof |