提交 e5c185a8 authored 作者: Michael Jerris's avatar Michael Jerris

fixed whitespace



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10833 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 10c6c9db
...@@ -326,7 +326,7 @@ bye_by_nua(nua_handle_t *nh, ...@@ -326,7 +326,7 @@ bye_by_nua(nua_handle_t *nh,
fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_unless(s2_check_callstate(nua_callstate_terminated));
} }
static void static void
bye_by_nua_challenged(nua_handle_t *nh, bye_by_nua_challenged(nua_handle_t *nh,
tag_type_t tag, tag_value_t value, ...) tag_type_t tag, tag_value_t value, ...)
{ {
...@@ -358,7 +358,7 @@ bye_by_nua_challenged(nua_handle_t *nh, ...@@ -358,7 +358,7 @@ bye_by_nua_challenged(nua_handle_t *nh,
} }
static void static void
cancel_by_nua(nua_handle_t *nh, cancel_by_nua(nua_handle_t *nh,
struct message *invite, struct message *invite,
struct dialog *dialog, struct dialog *dialog,
...@@ -383,7 +383,7 @@ cancel_by_nua(nua_handle_t *nh, ...@@ -383,7 +383,7 @@ cancel_by_nua(nua_handle_t *nh,
fail_unless(s2_check_event(nua_r_invite, 487)); fail_unless(s2_check_event(nua_r_invite, 487));
} }
static void static void
bye_to_nua(nua_handle_t *nh, bye_to_nua(nua_handle_t *nh,
tag_type_t tag, tag_value_t value, ...) tag_type_t tag, tag_value_t value, ...)
{ {
...@@ -1094,7 +1094,7 @@ START_TEST(call_2_3_3) ...@@ -1094,7 +1094,7 @@ START_TEST(call_2_3_3)
s2_request_to(dialog, SIP_METHOD_INVITE, NULL, s2_request_to(dialog, SIP_METHOD_INVITE, NULL,
SIPTAG_USER_AGENT_STR("evil (evil) evil"), SIPTAG_USER_AGENT_STR("evil (evil) evil"),
TAG_END()); TAG_END());
nua_respond(nh, SIP_200_OK, TAG_END()); nua_respond(nh, SIP_200_OK, TAG_END());
fail_unless(s2_check_callstate(nua_callstate_completed)); fail_unless(s2_check_callstate(nua_callstate_completed));
...@@ -1119,7 +1119,7 @@ START_TEST(call_2_3_3) ...@@ -1119,7 +1119,7 @@ START_TEST(call_2_3_3)
s2_request_to(dialog, SIP_METHOD_INVITE, NULL, s2_request_to(dialog, SIP_METHOD_INVITE, NULL,
SIPTAG_USER_AGENT_STR("evil (evil) evil"), SIPTAG_USER_AGENT_STR("evil (evil) evil"),
TAG_END()); TAG_END());
nua_respond(nh, SIP_200_OK, TAG_END()); nua_respond(nh, SIP_200_OK, TAG_END());
fail_unless(s2_check_callstate(nua_callstate_completed)); fail_unless(s2_check_callstate(nua_callstate_completed));
...@@ -1564,7 +1564,7 @@ START_TEST(call_2_6_2) ...@@ -1564,7 +1564,7 @@ START_TEST(call_2_6_2)
invite = s2_wait_for_request(SIP_METHOD_INVITE); invite = s2_wait_for_request(SIP_METHOD_INVITE);
fail_if(!invite); fail_if(!invite);
respond_with_sdp(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR, respond_with_sdp(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR,
SIPTAG_RETRY_AFTER_STR("8"), SIPTAG_RETRY_AFTER_STR("8"),
TAG_END()); TAG_END());
s2_free_message(invite); s2_free_message(invite);
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/** Defined when <nua_params.h> has been included. */ /** Defined when <nua_params.h> has been included. */
#define NUA_PARAMS_H #define NUA_PARAMS_H
/**@internal @file nua_params.h /**@internal @file nua_params.h
* @brief Parameters and their handling * @brief Parameters and their handling
* *
* @author Pekka Pessi <Pekka.Pessi@nokia.com> * @author Pekka Pessi <Pekka.Pessi@nokia.com>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <nua_types.h> #include <nua_types.h>
/**@internal @brief NUA preferences. /**@internal @brief NUA preferences.
* *
* This structure contains values for various preferences and a separate * This structure contains values for various preferences and a separate
* bitmap (nhp_set) for each preference. Preferences are set using * bitmap (nhp_set) for each preference. Preferences are set using
...@@ -69,7 +69,7 @@ struct nua_handle_preferences ...@@ -69,7 +69,7 @@ struct nua_handle_preferences
unsigned nhp_auto_ack:1; /**< Automatically ACK a final response */ unsigned nhp_auto_ack:1; /**< Automatically ACK a final response */
unsigned :0; unsigned :0;
/** INVITE timeout. /** INVITE timeout.
* *
* If no response is received in nhp_invite_timeout seconds, * If no response is received in nhp_invite_timeout seconds,
* INVITE client transaction times out * INVITE client transaction times out
...@@ -80,12 +80,12 @@ struct nua_handle_preferences ...@@ -80,12 +80,12 @@ struct nua_handle_preferences
/** Default Min-SE Delta value */ /** Default Min-SE Delta value */
unsigned nhp_min_se; unsigned nhp_min_se;
/** no (preference), local or remote */ /** no (preference), local or remote */
enum nua_session_refresher nhp_refresher; enum nua_session_refresher nhp_refresher;
unsigned nhp_update_refresh:1; /**< Use UPDATE to refresh */ unsigned nhp_update_refresh:1; /**< Use UPDATE to refresh */
/**< Accept refreshes without SDP */ /**< Accept refreshes without SDP */
unsigned nhp_refresh_without_sdp:1; unsigned nhp_refresh_without_sdp:1;
/* Messaging preferences */ /* Messaging preferences */
unsigned nhp_message_enable : 1; unsigned nhp_message_enable : 1;
/** Be bug-compatible with Windows Messenger */ /** Be bug-compatible with Windows Messenger */
...@@ -131,8 +131,8 @@ struct nua_handle_preferences ...@@ -131,8 +131,8 @@ struct nua_handle_preferences
char const *nhp_instance; char const *nhp_instance;
/** Outbound OPTIONS */ /** Outbound OPTIONS */
char const *nhp_outbound; char const *nhp_outbound;
sip_allow_t *nhp_appl_method; sip_allow_t *nhp_appl_method;
/** Initial route set */ /** Initial route set */
...@@ -143,11 +143,11 @@ struct nua_handle_preferences ...@@ -143,11 +143,11 @@ struct nua_handle_preferences
union { struct { union { struct {
/* A bit for each feature set by application */ /* A bit for each feature set by application */
/* NOTE: /* NOTE:
Some compilers behave weird if there are bitfields Some compilers behave weird if there are bitfields
together with width > 32 together with width > 32
So there should be a padding field (unsigned:0;) So there should be a padding field (unsigned:0;)
every 32 bits. every 32 bits.
*/ */
unsigned nhb_retry_count:1; unsigned nhb_retry_count:1;
unsigned nhb_max_subscriptions:1; unsigned nhb_max_subscriptions:1;
...@@ -165,7 +165,7 @@ struct nua_handle_preferences ...@@ -165,7 +165,7 @@ struct nua_handle_preferences
unsigned nhb_session_timer:1; unsigned nhb_session_timer:1;
unsigned nhb_min_se:1; unsigned nhb_min_se:1;
unsigned nhb_refresher:1; unsigned nhb_refresher:1;
unsigned nhb_update_refresh:1; unsigned nhb_update_refresh:1;
unsigned nhb_refresh_without_sdp:1; unsigned nhb_refresh_without_sdp:1;
unsigned nhb_message_enable:1; unsigned nhb_message_enable:1;
...@@ -202,7 +202,7 @@ struct nua_handle_preferences ...@@ -202,7 +202,7 @@ struct nua_handle_preferences
unsigned nhb_initial_route:1; unsigned nhb_initial_route:1;
unsigned nhb_proxy:1; unsigned nhb_proxy:1;
unsigned :0; unsigned :0;
} set_bits; } set_bits;
unsigned set_unsigned[2]; unsigned set_unsigned[2];
} nhp_set_; } nhp_set_;
}; };
...@@ -222,7 +222,7 @@ struct nua_global_preferences { ...@@ -222,7 +222,7 @@ struct nua_global_preferences {
unsigned ngp_detect_network_updates:1; unsigned ngp_detect_network_updates:1;
unsigned ngp_shutdown_events:1; unsigned ngp_shutdown_events:1;
unsigned :0; unsigned :0;
} set_bits; } set_bits;
unsigned set_unsigned[2]; unsigned set_unsigned[2];
} ngp_set_; } ngp_set_;
}; };
...@@ -250,7 +250,7 @@ struct nua_global_preferences { ...@@ -250,7 +250,7 @@ struct nua_global_preferences {
#define NH_PGET(nh, pref) \ #define NH_PGET(nh, pref) \
NHP_GET((nh)->nh_prefs, (nh)->nh_dprefs, pref) NHP_GET((nh)->nh_prefs, (nh)->nh_dprefs, pref)
/* Get preference from handle, if exists and set, /* Get preference from handle, if exists and set,
otherwise from default handle */ otherwise from default handle */
#define NUA_PGET(nua, nh, pref) \ #define NUA_PGET(nua, nh, pref) \
NHP_GET((nh) ? (nh)->nh_prefs : (nua)->nua_dhandle->nh_prefs, \ NHP_GET((nh) ? (nh)->nh_prefs : (nua)->nua_dhandle->nh_prefs, \
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论