Commit dfc708e7 authored by Pekka Pessi's avatar Pekka Pessi

sip/sofia-sip/sip.h: fixed whitespace

darcs-hash:20081127130403-db55f-c7f4f290404e8fa14630d29a8f4602c6b1f21538.gz
parent 8d39e8d9
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
/** Defined when <sofia-sip/sip.h> has been included. */ /** Defined when <sofia-sip/sip.h> has been included. */
#define SIP_H #define SIP_H
/**@file sofia-sip/sip.h /**@file sofia-sip/sip.h
* *
* SIP objects. * SIP objects.
* *
* @author Pekka Pessi <Pekka.Pessi@nokia.com>. * @author Pekka Pessi <Pekka.Pessi@nokia.com>.
...@@ -185,7 +185,7 @@ typedef struct sip_caller_prefs_s sip_reject_contact_t; ...@@ -185,7 +185,7 @@ typedef struct sip_caller_prefs_s sip_reject_contact_t;
typedef msg_list_t sip_require_t; typedef msg_list_t sip_require_t;
typedef struct sip_retry_after_s sip_retry_after_t; typedef struct sip_retry_after_s sip_retry_after_t;
typedef struct sip_route_s sip_route_t; typedef struct sip_route_s sip_route_t;
typedef struct sip_rseq_s sip_rseq_t; typedef struct sip_rseq_s sip_rseq_t;
typedef struct msg_generic_s sip_server_t; typedef struct msg_generic_s sip_server_t;
typedef struct sip_session_expires_s typedef struct sip_session_expires_s
sip_session_expires_t; sip_session_expires_t;
...@@ -256,7 +256,7 @@ struct sip_s { ...@@ -256,7 +256,7 @@ struct sip_s {
sip_rack_t *sip_rack; /**< RAck */ sip_rack_t *sip_rack; /**< RAck */
/* Caller Preferences */ /* Caller Preferences */
sip_request_disposition_t *sip_request_disposition; sip_request_disposition_t *sip_request_disposition;
/**< Request-Disposition (d) */ /**< Request-Disposition (d) */
sip_accept_contact_t *sip_accept_contact;/**< Accept-Contact (a) */ sip_accept_contact_t *sip_accept_contact;/**< Accept-Contact (a) */
sip_reject_contact_t *sip_reject_contact;/**< Reject-Contact (j) */ sip_reject_contact_t *sip_reject_contact;/**< Reject-Contact (j) */
...@@ -288,7 +288,7 @@ struct sip_s { ...@@ -288,7 +288,7 @@ struct sip_s {
/* RFC 3265 */ /* RFC 3265 */
sip_event_t *sip_event; /**< Event (o) */ sip_event_t *sip_event; /**< Event (o) */
sip_allow_events_t *sip_allow_events; /**< Allow-Events (u) */ sip_allow_events_t *sip_allow_events; /**< Allow-Events (u) */
sip_subscription_state_t *sip_subscription_state; sip_subscription_state_t *sip_subscription_state;
/**< Subscription-State */ /**< Subscription-State */
sip_proxy_authenticate_t *sip_proxy_authenticate; sip_proxy_authenticate_t *sip_proxy_authenticate;
...@@ -297,7 +297,7 @@ struct sip_s { ...@@ -297,7 +297,7 @@ struct sip_s {
/**< Proxy-Authentication-Info */ /**< Proxy-Authentication-Info */
sip_proxy_authorization_t *sip_proxy_authorization; sip_proxy_authorization_t *sip_proxy_authorization;
/**< Proxy-Authorization */ /**< Proxy-Authorization */
sip_authorization_t *sip_authorization; sip_authorization_t *sip_authorization;
/**< Authorization */ /**< Authorization */
sip_www_authenticate_t *sip_www_authenticate; sip_www_authenticate_t *sip_www_authenticate;
/**< WWW-Authenticate */ /**< WWW-Authenticate */
...@@ -333,17 +333,17 @@ struct sip_s { ...@@ -333,17 +333,17 @@ struct sip_s {
/* Entity headers */ /* Entity headers */
sip_mime_version_t *sip_mime_version; /**< MIME-Version */ sip_mime_version_t *sip_mime_version; /**< MIME-Version */
sip_content_type_t *sip_content_type; /**< Content-Type (c) */ sip_content_type_t *sip_content_type; /**< Content-Type (c) */
sip_content_encoding_t *sip_content_encoding; sip_content_encoding_t *sip_content_encoding;
/**< Content-Encoding (e) */ /**< Content-Encoding (e) */
sip_content_language_t *sip_content_language; /**< Content-Language */ sip_content_language_t *sip_content_language; /**< Content-Language */
sip_content_disposition_t *sip_content_disposition; sip_content_disposition_t *sip_content_disposition;
/**< Content-Disposition */ /**< Content-Disposition */
sip_content_length_t *sip_content_length;/**< Content-Length (l) */ sip_content_length_t *sip_content_length;/**< Content-Length (l) */
/* === Headers end here */ /* === Headers end here */
sip_unknown_t *sip_unknown; /**< Unknown headers */ sip_unknown_t *sip_unknown; /**< Unknown headers */
sip_separator_t *sip_separator; sip_separator_t *sip_separator;
/**< Separator between headers and payload */ /**< Separator between headers and payload */
sip_payload_t *sip_payload; /**< Message payload */ sip_payload_t *sip_payload; /**< Message payload */
msg_multipart_t *sip_multipart; /**< Multipart MIME payload */ msg_multipart_t *sip_multipart; /**< Multipart MIME payload */
...@@ -386,7 +386,7 @@ struct sip_addr_s ...@@ -386,7 +386,7 @@ struct sip_addr_s
url_t a_url[1]; /**< URL */ url_t a_url[1]; /**< URL */
msg_param_t const *a_params; /**< Parameter table */ msg_param_t const *a_params; /**< Parameter table */
char const *a_comment; /**< Comment */ char const *a_comment; /**< Comment */
char const *a_tag; /**< Tag parameter */ char const *a_tag; /**< Tag parameter */
}; };
...@@ -416,7 +416,7 @@ struct sip_allow_s ...@@ -416,7 +416,7 @@ struct sip_allow_s
msg_common_t k_common[1]; /**< Common fragment info */ msg_common_t k_common[1]; /**< Common fragment info */
msg_list_t *k_next; /**< Link to next */ msg_list_t *k_next; /**< Link to next */
msg_param_t *k_items; /**< List of allowed items */ msg_param_t *k_items; /**< List of allowed items */
uint32_t k_bitmap; /**< Bitmap of allowed methods. uint32_t k_bitmap; /**< Bitmap of allowed methods.
@NEW_1_12_5. */ @NEW_1_12_5. */
}; };
...@@ -432,10 +432,10 @@ struct sip_authentication_info_s ...@@ -432,10 +432,10 @@ struct sip_authentication_info_s
msg_param_t const *ai_params; /**< List of authentication info */ msg_param_t const *ai_params; /**< List of authentication info */
}; };
/**@ingroup sip_call_id /**@ingroup sip_call_id
* @brief Structure for @CallID (and @InReplyTo) header fields. * @brief Structure for @CallID (and @InReplyTo) header fields.
*/ */
struct sip_call_id_s { struct sip_call_id_s {
sip_common_t i_common[1]; /**< Common fragment info */ sip_common_t i_common[1]; /**< Common fragment info */
sip_call_id_t *i_next; /**< Link to next (In-Reply-To) */ sip_call_id_t *i_next; /**< Link to next (In-Reply-To) */
char const *i_id; /**< ID value */ char const *i_id; /**< ID value */
...@@ -531,7 +531,7 @@ struct sip_error_info_s ...@@ -531,7 +531,7 @@ struct sip_error_info_s
/**@ingroup sip_event /**@ingroup sip_event
* @brief Structure for @Event header. * @brief Structure for @Event header.
*/ */
struct sip_event_s struct sip_event_s
{ {
sip_common_t o_common[1]; /**< Common fragment info */ sip_common_t o_common[1]; /**< Common fragment info */
sip_error_t *o_next; /**< Link to next (dummy) */ sip_error_t *o_next; /**< Link to next (dummy) */
...@@ -686,7 +686,7 @@ struct sip_route_s ...@@ -686,7 +686,7 @@ struct sip_route_s
msg_param_t const *r_params; /**< List of route parameters */ msg_param_t const *r_params; /**< List of route parameters */
}; };
/**@ingroup sip_rseq /**@ingroup sip_rseq
* @brief Structure for @RSeq header. * @brief Structure for @RSeq header.
*/ */
struct sip_rseq_s struct sip_rseq_s
...@@ -696,7 +696,7 @@ struct sip_rseq_s ...@@ -696,7 +696,7 @@ struct sip_rseq_s
unsigned long rs_response; /**< Sequence number of response */ unsigned long rs_response; /**< Sequence number of response */
}; };
/**@ingroup sip_session_expires /**@ingroup sip_session_expires
* @brief Structure for @SessionExpires header. * @brief Structure for @SessionExpires header.
*/ */
struct sip_session_expires_s struct sip_session_expires_s
...@@ -709,7 +709,7 @@ struct sip_session_expires_s ...@@ -709,7 +709,7 @@ struct sip_session_expires_s
* parameter: UAS or UAC */ * parameter: UAS or UAC */
}; };
/**@ingroup sip_min_se /**@ingroup sip_min_se
* @brief Structure for @MinSE header. * @brief Structure for @MinSE header.
*/ */
struct sip_min_se_s struct sip_min_se_s
...@@ -720,7 +720,7 @@ struct sip_min_se_s ...@@ -720,7 +720,7 @@ struct sip_min_se_s
msg_param_t const *min_params; /**< List of extension parameters */ msg_param_t const *min_params; /**< List of extension parameters */
}; };
/**@ingroup sip_subscription_state /**@ingroup sip_subscription_state
* @brief Structure for @SubscriptionState header. * @brief Structure for @SubscriptionState header.
*/ */
struct sip_subscription_state_s struct sip_subscription_state_s
...@@ -728,7 +728,7 @@ struct sip_subscription_state_s ...@@ -728,7 +728,7 @@ struct sip_subscription_state_s
sip_common_t ss_common[1]; /**< Common fragment info */ sip_common_t ss_common[1]; /**< Common fragment info */
sip_error_t *ss_next; /**< Dummy link to next */ sip_error_t *ss_next; /**< Dummy link to next */
/** Subscription state: "pending", "active" or "terminated" */ /** Subscription state: "pending", "active" or "terminated" */
char const *ss_substate; char const *ss_substate;
msg_param_t const *ss_params; /**< List of parameters */ msg_param_t const *ss_params; /**< List of parameters */
char const *ss_reason; /**< Reason for termination */ char const *ss_reason; /**< Reason for termination */
char const *ss_expires; /**< Subscription lifetime */ char const *ss_expires; /**< Subscription lifetime */
...@@ -738,7 +738,7 @@ struct sip_subscription_state_s ...@@ -738,7 +738,7 @@ struct sip_subscription_state_s
/**@ingroup sip_timestamp /**@ingroup sip_timestamp
* @brief Structure for @Timestamp header. * @brief Structure for @Timestamp header.
*/ */
struct sip_timestamp_s struct sip_timestamp_s
{ {
sip_common_t ts_common[1]; /**< Common fragment info */ sip_common_t ts_common[1]; /**< Common fragment info */
sip_error_t *ts_next; /**< Dummy link to next */ sip_error_t *ts_next; /**< Dummy link to next */
...@@ -773,7 +773,7 @@ struct sip_via_s ...@@ -773,7 +773,7 @@ struct sip_via_s
struct sip_security_agree_s struct sip_security_agree_s
{ {
sip_common_t sa_common[1]; /**< Common fragment info */ sip_common_t sa_common[1]; /**< Common fragment info */
struct sip_security_agree_s struct sip_security_agree_s
*sa_next; /**< Link to next mechanism */ *sa_next; /**< Link to next mechanism */
char const *sa_mec; /**< Security mechanism */ char const *sa_mec; /**< Security mechanism */
msg_param_t const *sa_params; /**< List of mechanism parameters */ msg_param_t const *sa_params; /**< List of mechanism parameters */
...@@ -798,7 +798,7 @@ struct sip_privacy_s ...@@ -798,7 +798,7 @@ struct sip_privacy_s
*/ */
union sip_header_u union sip_header_u
{ {
sip_common_t sh_common[1]; sip_common_t sh_common[1];
struct struct
{ {
sip_common_t shn_common; sip_common_t shn_common;
...@@ -832,7 +832,7 @@ union sip_header_u ...@@ -832,7 +832,7 @@ union sip_header_u
sip_cseq_t sh_cseq[1]; sip_cseq_t sh_cseq[1];
sip_rseq_t sh_rseq[1]; sip_rseq_t sh_rseq[1];
sip_rack_t sh_rack[1]; sip_rack_t sh_rack[1];
sip_subject_t sh_subject[1]; sip_subject_t sh_subject[1];
sip_priority_t sh_priority[1]; sip_priority_t sh_priority[1];
...@@ -851,7 +851,7 @@ union sip_header_u ...@@ -851,7 +851,7 @@ union sip_header_u
sip_accept_t sh_accept[1]; sip_accept_t sh_accept[1];
sip_accept_encoding_t sh_accept_encoding[1]; sip_accept_encoding_t sh_accept_encoding[1];
sip_accept_language_t sh_accept_language[1]; sip_accept_language_t sh_accept_language[1];
sip_allow_t sh_allow[1]; sip_allow_t sh_allow[1];
sip_require_t sh_require[1]; sip_require_t sh_require[1];
sip_proxy_require_t sh_proxy_require[1]; sip_proxy_require_t sh_proxy_require[1];
...@@ -864,8 +864,8 @@ union sip_header_u ...@@ -864,8 +864,8 @@ union sip_header_u
sip_proxy_authenticate_t sh_proxy_authenticate[1]; sip_proxy_authenticate_t sh_proxy_authenticate[1];
sip_proxy_authentication_info_t sh_proxy_authentication_info[1]; sip_proxy_authentication_info_t sh_proxy_authentication_info[1];
sip_proxy_authorization_t sh_proxy_authorization[1]; sip_proxy_authorization_t sh_proxy_authorization[1];
sip_authorization_t sh_authorization[1]; sip_authorization_t sh_authorization[1];
sip_www_authenticate_t sh_www_authenticate[1]; sip_www_authenticate_t sh_www_authenticate[1];
sip_authentication_info_t sh_authentication_info[1]; sip_authentication_info_t sh_authentication_info[1];
...@@ -882,7 +882,7 @@ union sip_header_u ...@@ -882,7 +882,7 @@ union sip_header_u
sip_request_disposition_t sh_request_disposition[1]; sip_request_disposition_t sh_request_disposition[1];
sip_accept_contact_t sh_accept_contact[1]; sip_accept_contact_t sh_accept_contact[1];
sip_reject_contact_t sh_reject_contact[1]; sip_reject_contact_t sh_reject_contact[1];
sip_session_expires_t sh_session_expires[1]; sip_session_expires_t sh_session_expires[1];
sip_min_se_t sh_min_se[1]; sip_min_se_t sh_min_se[1];
...@@ -899,7 +899,7 @@ union sip_header_u ...@@ -899,7 +899,7 @@ union sip_header_u
sip_etag_t sh_etag[1]; sip_etag_t sh_etag[1];
sip_if_match_t sh_if_match[1]; sip_if_match_t sh_if_match[1];
/* Entity headers */ /* Entity headers */
sip_mime_version_t sh_mime_version[1]; sip_mime_version_t sh_mime_version[1];
sip_content_type_t sh_content_type[1]; sip_content_type_t sh_content_type[1];
......
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