summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2007-01-24 18:38:04 (UTC)
committer korovkin <korovkin>2007-01-24 18:38:04 (UTC)
commita4a7bd22feb060a80e20c81cded43cc24f5cd423 (patch) (side-by-side diff)
tree5d92d27b96ad235f3815014f98d49c766461a678
parent8644340455a433f4d6e3b31b329479f1e7983f78 (diff)
downloadopie-a4a7bd22feb060a80e20c81cded43cc24f5cd423.zip
opie-a4a7bd22feb060a80e20c81cded43cc24f5cd423.tar.gz
opie-a4a7bd22feb060a80e20c81cded43cc24f5cd423.tar.bz2
OBEX push server has a more common description.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obexserver.cpp2
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
@@ -308,65 +308,65 @@ sdp_session_t* ObexServer::addOpushSvc(uint8_t chan, const char* name)
// disconnect
lsession = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY);
if (lsession == NULL)
goto errout;
err = sdp_record_register(lsession, &record, 0);
if (err) {
sdp_close(lsession);
lsession = NULL;
}
errout:
sdp_data_free(channel);
sdp_list_free(proto[0], 0);
sdp_list_free(proto[1], 0);
sdp_list_free(proto[2], 0);
sdp_list_free(apseq, 0);
sdp_list_free(aproto, 0);
return lsession;
}
int ObexServer::initObex(void)
{
int channel = 10; //Channel on which we do listen
if (m_obex)
return 0;
m_obex = ::OBEX_Init(transport, obex_event, 0);
if (!m_obex) {
printf("OBEX initialization error %d\n", errno);
return -1;
}
if (transport == OBEX_TRANS_BLUETOOTH) {
::BtOBEX_ServerRegister(m_obex, NULL, channel);
- m_session = addOpushSvc(channel, "OBEX push service");
+ m_session = addOpushSvc(channel, "OBEX Object Push");
if (!m_session) {
printf("OBEX registration error %d\n", errno);
::OBEX_Cleanup(m_obex);
m_obex = NULL;
return -1;
}
} else if (transport == OBEX_TRANS_IRDA)
::IrOBEX_ServerRegister(m_obex, "OBEX");
return 0;
}
bool ObexServer::start(RunMode runmode, Communication comm)
{
if ( runs )
{
return false; // cannot start a process that is already running
// or if no executable has been assigned
}
run_mode = runmode;
status = 0;
if ( !setupCommunication( comm ) )
qWarning( "Could not setup Communication!" );
// We do this in the parent because if we do it in the child process
// gdb gets confused when the application runs from gdb.
uid_t uid = getuid();
gid_t gid = getgid();
#ifdef HAVE_INITGROUPS
struct passwd *pw = getpwuid( uid );
#endif