Commit b38cc27b authored by Pekka Pessi's avatar Pekka Pessi

nta_internal.h: fixed type for sa_next.

Re-ordered some fields for best possible 64-bit experience.

darcs-hash:20070125155043-65a35-59ab3197895410c14c05439287c47105cdcb7d86.gz
parent d012b5d1
...@@ -101,9 +101,9 @@ struct nta_agent_s ...@@ -101,9 +101,9 @@ struct nta_agent_s
nta_update_magic_t *sa_update_magic; nta_update_magic_t *sa_update_magic;
nta_update_tport_f *sa_update_tport; nta_update_tport_f *sa_update_tport;
su_duration_t sa_next; /**< Timestamp for next agent_timer. */
su_time_t sa_now; /**< Timestamp in microsecond resolution. */ su_time_t sa_now; /**< Timestamp in microsecond resolution. */
uint32_t sa_millisec; /**< Timestamp in milliseconds resolution. */ uint32_t sa_millisec; /**< Timestamp in milliseconds resolution. */
uint32_t sa_next; /**< Timestamp for next timer. */
uint32_t sa_nw_updates; /* Shall we enable network detector? */ uint32_t sa_nw_updates; /* Shall we enable network detector? */
...@@ -467,12 +467,17 @@ struct nta_outgoing_s ...@@ -467,12 +467,17 @@ struct nta_outgoing_s
sip_method_t orq_method; sip_method_t orq_method;
char const *orq_method_name; char const *orq_method_name;
url_t const *orq_url; /**< Original RequestURI */
sip_from_t const *orq_from; sip_from_t const *orq_from;
sip_to_t const *orq_to; sip_to_t const *orq_to;
char const *orq_tag; /**< Tag from final response. */
sip_cseq_t const *orq_cseq; sip_cseq_t const *orq_cseq;
sip_call_id_t const *orq_call_id; sip_call_id_t const *orq_call_id;
char const *orq_tag; /**< Tag from final response. */ msg_t *orq_request;
msg_t *orq_response;
su_time_t orq_sent; /**< When request was sent? */ su_time_t orq_sent; /**< When request was sent? */
unsigned orq_delay; /**< RTT estimate */ unsigned orq_delay; /**< RTT estimate */
...@@ -505,11 +510,9 @@ struct nta_outgoing_s ...@@ -505,11 +510,9 @@ struct nta_outgoing_s
unsigned orq_sigcomp_new:1; /**< Create compartment if needed */ unsigned orq_sigcomp_new:1; /**< Create compartment if needed */
unsigned orq_sigcomp_zap:1; /**< Reset SigComp after completing */ unsigned orq_sigcomp_zap:1; /**< Reset SigComp after completing */
unsigned orq_must_100rel : 1; unsigned orq_must_100rel : 1;
unsigned orq_timestamp : 1; /**< insert @Timestamp header. */ unsigned orq_timestamp : 1; /**< Insert @Timestamp header. */
unsigned : 0; /* pad */ unsigned : 0; /* pad */
uint32_t orq_rseq; /**< Latest incoming rseq */
#if HAVE_SOFIA_SRESOLV #if HAVE_SOFIA_SRESOLV
sipdns_resolver_t *orq_resolver; sipdns_resolver_t *orq_resolver;
#endif #endif
...@@ -526,12 +529,10 @@ struct nta_outgoing_s ...@@ -526,12 +529,10 @@ struct nta_outgoing_s
char const *orq_branch; /**< Transaction branch */ char const *orq_branch; /**< Transaction branch */
char const *orq_via_branch; /**< @Via branch */ char const *orq_via_branch; /**< @Via branch */
url_t const *orq_url; /**< Original RequestURI */
msg_t *orq_request;
msg_t *orq_response;
nta_outgoing_t *orq_cancel; /**< CANCEL transaction */ nta_outgoing_t *orq_cancel; /**< CANCEL transaction */
uint32_t orq_rseq; /**< Latest incoming rseq */
}; };
/* Virtual function table for plugging in SigComp */ /* Virtual function table for plugging in SigComp */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment