-rw-r--r-- | core/obex/obexserver.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index 95196de..25d8224 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp | |||
@@ -50,5 +50,6 @@ using namespace OpieObex; | |||
50 | 50 | ||
51 | ObexServer::ObexServer() : | 51 | ObexServer::ObexServer(int trans) : |
52 | OProcess(tr("ObexServer"), 0, "ObexServer") | 52 | OProcess(tr("ObexServer"), 0, "ObexServer") |
53 | { | 53 | { |
54 | transport = trans; | ||
54 | m_obex = NULL; | 55 | m_obex = NULL; |
@@ -331,3 +332,3 @@ int ObexServer::initObex(void) | |||
331 | return 0; | 332 | return 0; |
332 | m_obex = ::OBEX_Init(OBEX_TRANS_BLUETOOTH, obex_event, 0); | 333 | m_obex = ::OBEX_Init(transport, obex_event, 0); |
333 | if (!m_obex) { | 334 | if (!m_obex) { |
@@ -336,10 +337,13 @@ int ObexServer::initObex(void) | |||
336 | } | 337 | } |
337 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); | 338 | if (transport == OBEX_TRANS_BLUETOOTH) { |
338 | m_session = addOpushSvc(channel, "OBEX push service"); | 339 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); |
339 | if (!m_session) { | 340 | m_session = addOpushSvc(channel, "OBEX push service"); |
340 | printf("OBEX registration error %d\n", errno); | 341 | if (!m_session) { |
341 | ::OBEX_Cleanup(m_obex); | 342 | printf("OBEX registration error %d\n", errno); |
342 | m_obex = NULL; | 343 | ::OBEX_Cleanup(m_obex); |
343 | return -1; | 344 | m_obex = NULL; |
344 | } | 345 | return -1; |
346 | } | ||
347 | } else if (transport == OBEX_TRANS_IRDA) | ||
348 | ::IrOBEX_ServerRegister(m_obex, "OBEX"); | ||
345 | return 0; | 349 | return 0; |