Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
2fc70d56
Commit
2fc70d56
authored
Sep 13, 2013
by
Tristan Matthews
Browse files
* #29736: sippresence: fix more warnings
parent
09994237
Changes
4
Hide whitespace changes
Inline
Side-by-side
daemon/src/sip/pres_sub_server.cpp
View file @
2fc70d56
...
...
@@ -241,6 +241,23 @@ pj_bool_t pres_on_rx_subscribe_request(pjsip_rx_data *rdata)
return
PJ_TRUE
;
}
pjsip_module
PresSubServer
::
mod_presence_server
=
{
NULL
,
NULL
,
/* prev, next. */
CONST_PJ_STR
(
"mod-presence-server"
),
/* Name. */
-
1
,
/* Id */
PJSIP_MOD_PRIORITY_DIALOG_USAGE
,
NULL
,
/* load() */
NULL
,
/* start() */
NULL
,
/* stop() */
NULL
,
/* unload() */
&
pres_on_rx_subscribe_request
,
/* on_rx_request() */
NULL
,
/* on_rx_response() */
NULL
,
/* on_tx_request. */
NULL
,
/* on_tx_response() */
NULL
,
/* on_tsx_state() */
};
PresSubServer
::
PresSubServer
(
SIPPresence
*
pres
,
pjsip_evsub
*
evsub
,
char
*
r
,
pjsip_dialog
*
d
)
...
...
daemon/src/sip/pres_sub_server.h
View file @
2fc70d56
...
...
@@ -44,30 +44,11 @@
extern
pj_bool_t
pres_on_rx_subscribe_request
(
pjsip_rx_data
*
rdata
);
static
pjsip_module
mod_presence_server
=
{
NULL
,
NULL
,
/* prev, next. */
CONST_PJ_STR
(
"mod-presence-server"
),
/* Name. */
-
1
,
/* Id */
PJSIP_MOD_PRIORITY_DIALOG_USAGE
,
NULL
,
/* load() */
NULL
,
/* start() */
NULL
,
/* stop() */
NULL
,
/* unload() */
&
pres_on_rx_subscribe_request
,
/* on_rx_request() */
NULL
,
/* on_rx_response() */
NULL
,
/* on_tx_request. */
NULL
,
/* on_tx_response() */
NULL
,
/* on_tsx_state() */
};
class
SIPpresence
;
class
PresSubServer
{
public:
PresSubServer
(
SIPPresence
*
pres
,
pjsip_evsub
*
evsub
,
char
*
r
,
pjsip_dialog
*
d
);
~
PresSubServer
();
/* TODO: add '< >' to URI for consistance*/
...
...
@@ -95,6 +76,8 @@ class PresSubServer {
friend
void
pres_evsub_on_srv_state
(
pjsip_evsub
*
sub
,
pjsip_event
*
event
);
friend
pj_bool_t
pres_on_rx_subscribe_request
(
pjsip_rx_data
*
rdata
);
static
pjsip_module
mod_presence_server
;
private:
NON_COPYABLE
(
PresSubServer
);
...
...
daemon/src/sip/sipaccount.cpp
View file @
2fc70d56
...
...
@@ -118,6 +118,7 @@ SIPAccount::SIPAccount(const std::string& accountID)
,
registrationStateDetailed_
()
,
keepAliveEnabled_
(
false
)
,
keepAliveTimer_
()
,
keepAliveTimerActive_
(
false
)
,
link_
(
SIPVoIPLink
::
instance
())
,
receivedParameter_
(
""
)
,
rPort_
(
-
1
)
...
...
daemon/src/sip/sipvoiplink.cpp
View file @
2fc70d56
...
...
@@ -535,7 +535,7 @@ SIPVoIPLink::SIPVoIPLink() : sipTransport(endpt_, cp_, pool_), sipAccountMap_(),
// presence/publish management
TRY
(
pjsip_pres_init_module
(
endpt_
,
pjsip_evsub_instance
()));
TRY
(
pjsip_endpt_register_module
(
endpt_
,
&
mod_presence_server
));
TRY
(
pjsip_endpt_register_module
(
endpt_
,
&
PresSubServer
::
mod_presence_server
));
static
const
pjsip_inv_callback
inv_cb
=
{
invite_session_state_changed_cb
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment