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
42d7529d
Commit
42d7529d
authored
Sep 11, 2013
by
Tristan Matthews
Browse files
* #29736: presence: cleanup
parent
8fe7bfa9
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
daemon/src/sip/pres_sub_client.cpp
View file @
42d7529d
This diff is collapsed.
Click to expand it.
daemon/src/sip/pres_sub_client.h
View file @
42d7529d
...
...
@@ -49,16 +49,16 @@ class SIPPresence;
*/
static
void
pres_client_evsub_on_state
(
pjsip_evsub
*
sub
,
pjsip_event
*
event
);
static
void
pres_client_evsub_on_tsx_state
(
pjsip_evsub
*
sub
,
pjsip_transaction
*
tsx
,
pjsip_event
*
event
);
pjsip_transaction
*
tsx
,
pjsip_event
*
event
);
static
void
pres_client_evsub_on_rx_notify
(
pjsip_evsub
*
sub
,
pjsip_rx_data
*
rdata
,
int
*
p_st_code
,
pj_str_t
**
p_st_text
,
pjsip_hdr
*
res_hdr
,
pjsip_msg_body
**
p_body
);
pjsip_rx_data
*
rdata
,
int
*
p_st_code
,
pj_str_t
**
p_st_text
,
pjsip_hdr
*
res_hdr
,
pjsip_msg_body
**
p_body
);
static
void
pres_client_timer_cb
(
pj_timer_heap_t
*
th
,
pj_timer_entry
*
entry
);
pj_timer_entry
*
entry
);
class
PresSubClient
{
...
...
@@ -114,24 +114,24 @@ class PresSubClient {
friend
void
pres_client_evsub_on_state
(
pjsip_evsub
*
sub
,
pjsip_event
*
event
);
friend
void
pres_client_evsub_on_tsx_state
(
pjsip_evsub
*
sub
,
pjsip_transaction
*
tsx
,
pjsip_event
*
event
);
pjsip_transaction
*
tsx
,
pjsip_event
*
event
);
friend
void
pres_client_evsub_on_rx_notify
(
pjsip_evsub
*
sub
,
pjsip_rx_data
*
rdata
,
int
*
p_st_code
,
pj_str_t
**
p_st_text
,
pjsip_hdr
*
res_hdr
,
pjsip_msg_body
**
p_body
);
pjsip_rx_data
*
rdata
,
int
*
p_st_code
,
pj_str_t
**
p_st_text
,
pjsip_hdr
*
res_hdr
,
pjsip_msg_body
**
p_body
);
friend
void
pres_client_timer_cb
(
pj_timer_heap_t
*
th
,
pj_timer_entry
*
entry
);
/**
* TODO: explain this:
*/
void
incLock
()
{
lock_count
++
;
lock_count
_
++
;
}
void
decLock
()
{
lock_count
--
;
lock_count
_
--
;
}
private:
...
...
@@ -161,22 +161,22 @@ class PresSubClient {
*/
unsigned
getTermCode
();
SIPPresence
*
pres
;
/**< Associated SIPPresence pointer */
pj_str_t
uri
;
/**< pres_client URI.
*/
pj_str_t
contact
;
/**< Contact learned from subscrp.
*/
pj_str_t
display
;
/**< pres_client display name.
*/
pjsip_dialog
*
dlg
;
/**< The underlying dialog.
*/
pj_bool_t
monitor
;
/**< Should we monitor?
*/
pj_str_t
name
;
/**< pres_client name.
*/
SIPPresence
*
pres
_
;
/**< Associated SIPPresence pointer */
pj_str_t
uri
_
;
/**< pres_client URI. */
pj_str_t
contact
_
;
/**< Contact learned from subscrp. */
pj_str_t
display
_
;
/**< pres_client display name. */
pjsip_dialog
*
dlg
_
;
/**< The underlying dialog. */
pj_bool_t
monitor
_
;
/**< Should we monitor? */
pj_str_t
name
_
;
/**< pres_client name. */
pj_caching_pool
cp_
;
pj_pool_t
*
pool
;
/**< Pool for this pres_client.
*/
pjsip_pres_status
status
;
/**< pres_client presence status.
*/
pjsip_evsub
*
sub
;
/**< pres_client presence subscription
*/
unsigned
term_code
;
/**< Subscription termination code
*/
pj_str_t
term_reason
;
/**< Subscription termination reason */
pj_timer_entry
timer
;
/**< Resubscription timer
*/
void
*
user_data
;
/**< Application data. */
int
lock_count
;
pj_pool_t
*
pool
_
;
/**< Pool for this pres_client. */
pjsip_pres_status
status
_
;
/**< pres_client presence status. */
pjsip_evsub
*
sub
_
;
/**< pres_client presence subscription */
unsigned
term_code
_
;
/**< Subscription termination code */
pj_str_t
term_reason
_
;
/**< Subscription termination reason */
pj_timer_entry
timer
_
;
/**< Resubscription timer */
void
*
user_data
_
;
/**< Application data. */
int
lock_count
_
;
};
#endif
/* PRES_SUB_CLIENT_H */
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