-rw-r--r-- | core/obex/obexserver.cpp | 8 |
1 files changed, 6 insertions, 2 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 | |||
@@ -48,9 +48,10 @@ using namespace Opie::Core; | |||
48 | using namespace Opie::Core::Internal; | 48 | using namespace Opie::Core::Internal; |
49 | using namespace OpieObex; | 49 | 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; |
55 | } | 56 | } |
56 | 57 | ||
@@ -329,11 +330,12 @@ int ObexServer::initObex(void) | |||
329 | int channel = 10; //Channel on which we do listen | 330 | int channel = 10; //Channel on which we do listen |
330 | if (m_obex) | 331 | if (m_obex) |
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) { |
334 | printf("OBEX initialization error %d\n", errno); | 335 | printf("OBEX initialization error %d\n", errno); |
335 | return -1; | 336 | return -1; |
336 | } | 337 | } |
338 | if (transport == OBEX_TRANS_BLUETOOTH) { | ||
337 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); | 339 | ::BtOBEX_ServerRegister(m_obex, NULL, channel); |
338 | m_session = addOpushSvc(channel, "OBEX push service"); | 340 | m_session = addOpushSvc(channel, "OBEX push service"); |
339 | if (!m_session) { | 341 | if (!m_session) { |
@@ -342,6 +344,8 @@ int ObexServer::initObex(void) | |||
342 | m_obex = NULL; | 344 | m_obex = NULL; |
343 | return -1; | 345 | return -1; |
344 | } | 346 | } |
347 | } else if (transport == OBEX_TRANS_IRDA) | ||
348 | ::IrOBEX_ServerRegister(m_obex, "OBEX"); | ||
345 | return 0; | 349 | return 0; |
346 | } | 350 | } |
347 | 351 | ||