-rw-r--r-- | core/obex/obexserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index 25d8224..f1fb205 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp | |||
@@ -316,49 +316,49 @@ sdp_session_t* ObexServer::addOpushSvc(uint8_t chan, const char* name) | |||
316 | } | 316 | } |
317 | errout: | 317 | errout: |
318 | sdp_data_free(channel); | 318 | sdp_data_free(channel); |
319 | sdp_list_free(proto[0], 0); | 319 | sdp_list_free(proto[0], 0); |
320 | sdp_list_free(proto[1], 0); | 320 | sdp_list_free(proto[1], 0); |
321 | sdp_list_free(proto[2], 0); | 321 | sdp_list_free(proto[2], 0); |
322 | sdp_list_free(apseq, 0); | 322 | sdp_list_free(apseq, 0); |
323 | sdp_list_free(aproto, 0); | 323 | sdp_list_free(aproto, 0); |
324 | 324 | ||
325 | return lsession; | 325 | return lsession; |
326 | } | 326 | } |
327 | 327 | ||
328 | int ObexServer::initObex(void) | 328 | int ObexServer::initObex(void) |
329 | { | 329 | { |
330 | int channel = 10; //Channel on which we do listen | 330 | int channel = 10; //Channel on which we do listen |
331 | if (m_obex) | 331 | if (m_obex) |
332 | return 0; | 332 | return 0; |
333 | m_obex = ::OBEX_Init(transport, obex_event, 0); | 333 | m_obex = ::OBEX_Init(transport, obex_event, 0); |
334 | if (!m_obex) { | 334 | if (!m_obex) { |
335 | printf("OBEX initialization error %d\n", errno); | 335 | printf("OBEX initialization error %d\n", errno); |
336 | return -1; | 336 | return -1; |
337 | } | 337 | } |
338 | if (transport == OBEX_TRANS_BLUETOOTH) { | 338 | if (transport == OBEX_TRANS_BLUETOOTH) { |
339 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); | 339 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); |
340 | m_session = addOpushSvc(channel, "OBEX push service"); | 340 | m_session = addOpushSvc(channel, "OBEX Object Push"); |
341 | if (!m_session) { | 341 | if (!m_session) { |
342 | printf("OBEX registration error %d\n", errno); | 342 | printf("OBEX registration error %d\n", errno); |
343 | ::OBEX_Cleanup(m_obex); | 343 | ::OBEX_Cleanup(m_obex); |
344 | m_obex = NULL; | 344 | m_obex = NULL; |
345 | return -1; | 345 | return -1; |
346 | } | 346 | } |
347 | } else if (transport == OBEX_TRANS_IRDA) | 347 | } else if (transport == OBEX_TRANS_IRDA) |
348 | ::IrOBEX_ServerRegister(m_obex, "OBEX"); | 348 | ::IrOBEX_ServerRegister(m_obex, "OBEX"); |
349 | return 0; | 349 | return 0; |
350 | } | 350 | } |
351 | 351 | ||
352 | bool ObexServer::start(RunMode runmode, Communication comm) | 352 | bool ObexServer::start(RunMode runmode, Communication comm) |
353 | { | 353 | { |
354 | if ( runs ) | 354 | if ( runs ) |
355 | { | 355 | { |
356 | return false; // cannot start a process that is already running | 356 | return false; // cannot start a process that is already running |
357 | // or if no executable has been assigned | 357 | // or if no executable has been assigned |
358 | } | 358 | } |
359 | run_mode = runmode; | 359 | run_mode = runmode; |
360 | status = 0; | 360 | status = 0; |
361 | 361 | ||
362 | if ( !setupCommunication( comm ) ) | 362 | if ( !setupCommunication( comm ) ) |
363 | qWarning( "Could not setup Communication!" ); | 363 | qWarning( "Could not setup Communication!" ); |
364 | 364 | ||