diff options
Diffstat (limited to 'tinyMSRP/include/tinymsrp')
25 files changed, 340 insertions, 371 deletions
diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header.h index ad574a4..20bf236 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -49,34 +49,32 @@ typedef int (*tmsrp_header_value_tostring_f)(const struct tmsrp_header_s* header * * @brief List of all supported headers. **/ -typedef enum tmsrp_header_type_e -{ - tmsrp_htype_Authentication_Info, - tmsrp_htype_Authorization, - tmsrp_htype_Byte_Range, - tmsrp_htype_Content_Type, - tmsrp_htype_Dummy, - tmsrp_htype_Expires, - tmsrp_htype_Failure_Report, - tmsrp_htype_From_Path, - tmsrp_htype_Max_Expires, - tmsrp_htype_Message_ID, - tmsrp_htype_Min_Expires, - tmsrp_htype_Status, - tmsrp_htype_Success_Report, - tmsrp_htype_To_Path, - tmsrp_htype_Use_Path, - tmsrp_htype_WWW_Authenticate +typedef enum tmsrp_header_type_e { + tmsrp_htype_Authentication_Info, + tmsrp_htype_Authorization, + tmsrp_htype_Byte_Range, + tmsrp_htype_Content_Type, + tmsrp_htype_Dummy, + tmsrp_htype_Expires, + tmsrp_htype_Failure_Report, + tmsrp_htype_From_Path, + tmsrp_htype_Max_Expires, + tmsrp_htype_Message_ID, + tmsrp_htype_Min_Expires, + tmsrp_htype_Status, + tmsrp_htype_Success_Report, + tmsrp_htype_To_Path, + tmsrp_htype_Use_Path, + tmsrp_htype_WWW_Authenticate } tmsrp_header_type_t; /*================================ */ -typedef struct tmsrp_header_s -{ - TSK_DECLARE_OBJECT; - tmsrp_header_type_t type; - tmsrp_header_value_tostring_f tostring; +typedef struct tmsrp_header_s { + TSK_DECLARE_OBJECT; + tmsrp_header_type_t type; + tmsrp_header_value_tostring_f tostring; } tmsrp_header_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Authorization.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Authorization.h index f671129..6340b9a 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Authorization.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Authorization.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -36,7 +36,7 @@ TMSRP_BEGIN_DECLS //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP header 'Authorization' as per RFC 3261 subclause . /// @@ -56,34 +56,33 @@ TMSRP_BEGIN_DECLS /// dresponse = "response" EQUAL request-digest /// request-digest = LDQUOT 32LHEX RDQUOT /// auth-request-uri = not-defined -/// +/// /// auth-param = auth-param-name EQUAL ( token / quoted-string ) /// auth-param-name = token -/// +/// /// other-response = auth-scheme LWS auth-param *(COMMA auth-param) /// auth-scheme = token /// auts = "auts" EQUAL auts-param /// auts-param = LDQUOT auts-value RDQUOT /// auts-value = <base64 encoding of AUTS> -/// +/// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Authorization_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_Authorization_s { + TMSRP_DECLARE_HEADER; - char* scheme; - char* username; - char* realm; - char* nonce; - char* uri; - char* response; - char* algorithm; - char* cnonce; - char* opaque; - char* qop; - char* nc; + char* scheme; + char* username; + char* realm; + char* nonce; + char* uri; + char* response; + char* algorithm; + char* cnonce; + char* opaque; + char* qop; + char* nc; - tsk_params_L_t *params; + tsk_params_L_t *params; } tmsrp_header_Authorization_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Byte-Range.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Byte-Range.h index f3db0e2..7612d31 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Byte-Range.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Byte-Range.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -40,23 +40,22 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_BYTE_RANGE_IS_VALID(self) ((self) && (self)->start > 0 && (self)->end > 0 && (self)->end > (self)->start) //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Byte-Range' header. /// /// @par ABNF : Byte-Range = "Byte-Range:" SP range-start "-" range-end "/" total /// range-start = 1*DIGIT /// range-end = 1*DIGIT / "*" -/// total = 1*DIGIT / "*" +/// total = 1*DIGIT / "*" /// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Byte_Range_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_Byte_Range_s { + TMSRP_DECLARE_HEADER; - int64_t start; - int64_t end; - int64_t total; + int64_t start; + int64_t end; + int64_t total; } tmsrp_header_Byte_Range_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Content-Type.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Content-Type.h index 465bb80..9c8cfcd 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Content-Type.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Content-Type.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -38,7 +38,7 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_CONTENT_TYPE_VA_ARGS(type) tmsrp_header_Content_Type_def_t, (const char*)type //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP header 'Content-Type'. /// @author Mamadou @@ -50,15 +50,14 @@ TMSRP_BEGIN_DECLS /// subtype = token /// gen-param = pname [ "=" pval ] /// pname = token -/// pval = token / quoted-string -/// +/// pval = token / quoted-string +/// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Content_Type_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_Content_Type_s { + TMSRP_DECLARE_HEADER; - char* value; - tsk_params_L_t *params; + char* value; + tsk_params_L_t *params; } tmsrp_header_Content_Type_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Dummy.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Dummy.h index 6c01856..d813487 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Dummy.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Dummy.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -38,19 +38,18 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_DUMMY_VA_ARGS(name, value) tmsrp_header_Dummy_def_t, (const char*)name, (const char*)value //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP Dummy header. /// /// @par ABNF : hname ":" SP hval CRLF -/// +/// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Dummy_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_Dummy_s { + TMSRP_DECLARE_HEADER; - char *name; - char *value; + char *name; + char *value; } tmsrp_header_Dummy_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Expires.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Expires.h index de715d7..565a1ba 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Expires.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Expires.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -38,18 +38,17 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_EXPIRES_VA_ARGS(value) tmsrp_header_Expires_def_t, (int64_t)value //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Expires' header. /// /// @par ABNF : Expires = "Expires:" SP 1*DIGIT /// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Expires_s -{ - TMSRP_DECLARE_HEADER; - - int64_t value; +typedef struct tmsrp_header_Expires_s { + TMSRP_DECLARE_HEADER; + + int64_t value; } tmsrp_header_Expires_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Failure-Report.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Failure-Report.h index 04360e8..b39b2ed 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Failure-Report.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Failure-Report.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -39,26 +39,24 @@ TMSRP_BEGIN_DECLS /** Failure report type; */ -typedef enum tmsrp_freport_type_e -{ - freport_yes, - freport_no, - freport_partial +typedef enum tmsrp_freport_type_e { + freport_yes, + freport_no, + freport_partial } tmsrp_freport_type_t; //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Failure-Report' header. /// -/// @par ABNF : "Failure-Report:" ( "yes" / "no" / "partial" ) +/// @par ABNF : "Failure-Report:" ( "yes" / "no" / "partial" ) /// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Failure_Report_s -{ - TMSRP_DECLARE_HEADER; - tmsrp_freport_type_t type; +typedef struct tmsrp_header_Failure_Report_s { + TMSRP_DECLARE_HEADER; + tmsrp_freport_type_t type; } tmsrp_header_Failure_Report_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_From-Path.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_From-Path.h index cc994aa..7998eed 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_From-Path.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_From-Path.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -40,19 +40,18 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_FROM_PATH_VA_ARGS(uri) tmsrp_header_From_Path_def_t, (const tmsrp_uri_t*)uri //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'From-Path' header. /// /// @par ABNF : "To-Path:" SP MSRP-URI *( SP MSRP-URI ) -/// +/// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_From_Path_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_From_Path_s { + TMSRP_DECLARE_HEADER; - tmsrp_uri_t *uri; - tmsrp_uris_L_t *otherURIs; + tmsrp_uri_t *uri; + tmsrp_uris_L_t *otherURIs; } tmsrp_header_From_Path_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Max-Expires.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Max-Expires.h index 07c0adf..c990c12 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Max-Expires.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Max-Expires.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -38,18 +38,17 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_MAX_EXPIRES_VA_ARGS(value) tmsrp_header_Max_Expires_def_t, (int64_t)value //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Max-Expires' header. /// /// @par ABNF : Max-Expires = "Max-Expires:" SP 1*DIGIT /// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Max_Expires_s -{ - TMSRP_DECLARE_HEADER; - - int64_t value; +typedef struct tmsrp_header_Max_Expires_s { + TMSRP_DECLARE_HEADER; + + int64_t value; } tmsrp_header_Max_Expires_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Message-ID.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Message-ID.h index 4862d58..8b9078a 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Message-ID.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Message-ID.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -38,7 +38,7 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_MESSAGE_ID_VA_ARGS(value) tmsrp_header_Message_ID_def_t, (const char*)value //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Message-Id' header. /// @@ -47,11 +47,10 @@ TMSRP_BEGIN_DECLS /// ident-char = ALPHANUM / "." / "-" / "+" / "%" / "=" /// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Message_ID_s -{ - TMSRP_DECLARE_HEADER; - - char *value; +typedef struct tmsrp_header_Message_ID_s { + TMSRP_DECLARE_HEADER; + + char *value; } tmsrp_header_Message_ID_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Min-Expires.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Min-Expires.h index 7607d71..5c07f44 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Min-Expires.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Min-Expires.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -38,18 +38,17 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_MIN_EXPIRES_VA_ARGS(value) tmsrp_header_Min_Expires_def_t, (int64_t)value //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Min-Expires' header. /// /// @par ABNF : Min-Expires = "Min-Expires:" SP 1*DIGIT /// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Min_Expires_s -{ - TMSRP_DECLARE_HEADER; - - int64_t value; +typedef struct tmsrp_header_Min_Expires_s { + TMSRP_DECLARE_HEADER; + + int64_t value; } tmsrp_header_Min_Expires_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Status.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Status.h index f571a69..d992b68 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Status.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Status.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -38,22 +38,21 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_STATUS_VA_ARGS(namespace, code, reason) tmsrp_header_Status_def_t, (short)namespace, (short)code, (const char*)reason //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Status' header. /// /// @par ABNF : Status = "Status:" SP namespace SP status-code [SP text-reason] /// namespace = 3(DIGIT) ; "000" for all codes defined in RFC 4975 -/// text-reason = utf8text +/// text-reason = utf8text /// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Status_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_Status_s { + TMSRP_DECLARE_HEADER; - short _namespace; - short code; - char* reason; + short _namespace; + short code; + char* reason; } tmsrp_header_Status_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Success-Report.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Success-Report.h index 4b79372..19f58a2 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Success-Report.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Success-Report.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -38,17 +38,16 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_SUCCESS_REPORT_VA_ARGS(isSuccess) tmsrp_header_Success_Report_def_t, (tsk_bool_t)isSuccess //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Success-Report' header. /// /// @par ABNF : "Success-Report:" ( "yes" / "no" ) /// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Success_Report_s -{ - TMSRP_DECLARE_HEADER; - unsigned yes:1; +typedef struct tmsrp_header_Success_Report_s { + TMSRP_DECLARE_HEADER; + unsigned yes:1; } tmsrp_header_Success_Report_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_To-Path.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_To-Path.h index 59e0c56..0f4b967 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_To-Path.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_To-Path.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -40,19 +40,18 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_TO_PATH_VA_ARGS(uri) tmsrp_header_To_Path_def_t, (const tmsrp_uri_t*)uri //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'To-Path' header. /// /// @par ABNF : "To-Path:" SP MSRP-URI *( SP MSRP-URI ) -/// +/// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_To_Path_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_To_Path_s { + TMSRP_DECLARE_HEADER; - tmsrp_uri_t *uri; - tmsrp_uris_L_t *otherURIs; + tmsrp_uri_t *uri; + tmsrp_uris_L_t *otherURIs; } tmsrp_header_To_Path_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Use-Path.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Use-Path.h index b819724..2c9237e 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Use-Path.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_Use-Path.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -40,19 +40,18 @@ TMSRP_BEGIN_DECLS #define TMSRP_HEADER_USE_PATH_VA_ARGS(uri) tmsrp_header_Use_Path_def_t, (const tmsrp_uri_t*)uri //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP 'Use-Path' header. /// /// @par ABNF : "Use-Path:" SP MSRP-URI *( SP MSRP-URI ) -/// +/// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_Use_Path_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_Use_Path_s { + TMSRP_DECLARE_HEADER; - tmsrp_uri_t *uri; - tmsrp_uris_L_t *otherURIs; + tmsrp_uri_t *uri; + tmsrp_uris_L_t *otherURIs; } tmsrp_header_Use_Path_t; diff --git a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_WWW-Authenticate.h b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_WWW-Authenticate.h index d620928..6d4cfc8 100755 --- a/tinyMSRP/include/tinymsrp/headers/tmsrp_header_WWW-Authenticate.h +++ b/tinyMSRP/include/tinymsrp/headers/tmsrp_header_WWW-Authenticate.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -37,7 +37,7 @@ TMSRP_BEGIN_DECLS //////////////////////////////////////////////////////////////////////////////////////////////////// -/// @struct +/// @struct /// /// @brief MSRP header 'WWW-Authenticate'. /// @@ -53,22 +53,21 @@ TMSRP_BEGIN_DECLS /// stale = "stale" EQUAL ( "true" / "false" ) /// qop-options = "qop" EQUAL LDQUOT qop-value *("," qop-value) RDQUOT /// qop-value = "auth" / "auth-int" / token -/// +/// //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef struct tmsrp_header_WWW_Authenticate_s -{ - TMSRP_DECLARE_HEADER; +typedef struct tmsrp_header_WWW_Authenticate_s { + TMSRP_DECLARE_HEADER; - char* scheme; - char* realm; - char* domain; - char* nonce; - char* opaque; - unsigned stale:1; - char* algorithm; - char* qop; + char* scheme; + char* realm; + char* domain; + char* nonce; + char* opaque; + unsigned stale:1; + char* algorithm; + char* qop; - tsk_params_L_t* params; + tsk_params_L_t* params; } tmsrp_header_WWW_Authenticate_t; diff --git a/tinyMSRP/include/tinymsrp/parsers/tmsrp_parser_message.h b/tinyMSRP/include/tinymsrp/parsers/tmsrp_parser_message.h index c6ef41d..e287b8a 100755 --- a/tinyMSRP/include/tinymsrp/parsers/tmsrp_parser_message.h +++ b/tinyMSRP/include/tinymsrp/parsers/tmsrp_parser_message.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyMSRP/include/tinymsrp/parsers/tmsrp_parser_uri.h b/tinyMSRP/include/tinymsrp/parsers/tmsrp_parser_uri.h index f0cfdf2..937c885 100755 --- a/tinyMSRP/include/tinymsrp/parsers/tmsrp_parser_uri.h +++ b/tinyMSRP/include/tinymsrp/parsers/tmsrp_parser_uri.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * diff --git a/tinyMSRP/include/tinymsrp/session/tmsrp_config.h b/tinyMSRP/include/tinymsrp/session/tmsrp_config.h index 48472b2..f9bbe8b 100755 --- a/tinyMSRP/include/tinymsrp/session/tmsrp_config.h +++ b/tinyMSRP/include/tinymsrp/session/tmsrp_config.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -43,16 +43,15 @@ TMSRP_BEGIN_DECLS # define TMSRP_MAX_CHUNK_SIZE 2048 #endif -typedef struct tmsrp_config_s -{ - TSK_DECLARE_OBJECT; +typedef struct tmsrp_config_s { + TSK_DECLARE_OBJECT; - tmsrp_header_To_Path_t* To_Path; - tmsrp_header_From_Path_t* From_Path; + tmsrp_header_To_Path_t* To_Path; + tmsrp_header_From_Path_t* From_Path; - tsk_bool_t Failure_Report; - tsk_bool_t Success_Report; - tsk_bool_t OMA_Final_Report; + tsk_bool_t Failure_Report; + tsk_bool_t Success_Report; + tsk_bool_t OMA_Final_Report; } tmsrp_config_t; diff --git a/tinyMSRP/include/tinymsrp/session/tmsrp_data.h b/tinyMSRP/include/tinymsrp/session/tmsrp_data.h index c24cdd8..2868d32 100755 --- a/tinyMSRP/include/tinymsrp/session/tmsrp_data.h +++ b/tinyMSRP/include/tinymsrp/session/tmsrp_data.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -42,40 +42,37 @@ TMSRP_BEGIN_DECLS #define TMSRP_DATA_IS_OUTGOING(self) (TMSRP_DATA(self)->outgoing) -typedef struct tmsrp_data_s -{ - TSK_DECLARE_OBJECT; - - tsk_bool_t outgoing; - tsk_bool_t isOK; - - char* id; - char* ctype; - char* wctype; +typedef struct tmsrp_data_s { + TSK_DECLARE_OBJECT; + + tsk_bool_t outgoing; + tsk_bool_t isOK; + + char* id; + char* ctype; + char* wctype; } tmsrp_data_t; #define TMSRP_DECLARE_DATA tmsrp_data_t data typedef tsk_list_t tmsrp_datas_L_t; -typedef struct tmsrp_data_in_s -{ - TMSRP_DECLARE_DATA; +typedef struct tmsrp_data_in_s { + TMSRP_DECLARE_DATA; - tsk_buffer_t* buffer; + tsk_buffer_t* buffer; } tmsrp_data_in_t; int tmsrp_data_in_put(tmsrp_data_in_t* self, const void* pdata, tsk_size_t size); tmsrp_message_t* tmsrp_data_in_get(tmsrp_data_in_t* self); -typedef struct tmsrp_data_out_s -{ - TMSRP_DECLARE_DATA; - - FILE* file; - tsk_buffer_t* message; - tsk_size_t size; // File/message size +typedef struct tmsrp_data_out_s { + TMSRP_DECLARE_DATA; + + FILE* file; + tsk_buffer_t* message; + tsk_size_t size; // File/message size } tmsrp_data_out_t; diff --git a/tinyMSRP/include/tinymsrp/session/tmsrp_receiver.h b/tinyMSRP/include/tinymsrp/session/tmsrp_receiver.h index 932ab8b..a4afdb5 100755 --- a/tinyMSRP/include/tinymsrp/session/tmsrp_receiver.h +++ b/tinyMSRP/include/tinymsrp/session/tmsrp_receiver.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -42,19 +42,18 @@ TMSRP_BEGIN_DECLS -typedef struct tmsrp_receiver_s -{ - TSK_DECLARE_OBJECT; +typedef struct tmsrp_receiver_s { + TSK_DECLARE_OBJECT; - tmsrp_data_in_t* data_in; - tmsrp_config_t* config; - tnet_fd_t fd; - tsk_buffer_t* buffer; + tmsrp_data_in_t* data_in; + tmsrp_config_t* config; + tnet_fd_t fd; + tsk_buffer_t* buffer; - struct { - tmsrp_event_cb_f func; - const void* data; - } callback; + struct { + tmsrp_event_cb_f func; + const void* data; + } callback; } tmsrp_receiver_t; diff --git a/tinyMSRP/include/tinymsrp/session/tmsrp_sender.h b/tinyMSRP/include/tinymsrp/session/tmsrp_sender.h index f0a814f..8e50c70 100755 --- a/tinyMSRP/include/tinymsrp/session/tmsrp_sender.h +++ b/tinyMSRP/include/tinymsrp/session/tmsrp_sender.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -41,14 +41,13 @@ TMSRP_BEGIN_DECLS -typedef struct tmsrp_sender_s -{ - TSK_DECLARE_RUNNABLE; +typedef struct tmsrp_sender_s { + TSK_DECLARE_RUNNABLE; - tmsrp_datas_L_t* outgoingList; - tmsrp_config_t* config; - tnet_fd_t fd; - uint64_t chunck_duration; + tmsrp_datas_L_t* outgoingList; + tmsrp_config_t* config; + tnet_fd_t fd; + uint64_t chunck_duration; } tmsrp_sender_t; diff --git a/tinyMSRP/include/tinymsrp/tmsrp_event.h b/tinyMSRP/include/tinymsrp/tmsrp_event.h index 6629a66..3f769cb 100755 --- a/tinyMSRP/include/tinymsrp/tmsrp_event.h +++ b/tinyMSRP/include/tinymsrp/tmsrp_event.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -39,25 +39,23 @@ TMSRP_BEGIN_DECLS -typedef enum tmsrp_event_type_e -{ - tmsrp_event_type_none, - tmsrp_event_type_connected, - tmsrp_event_type_disconnected, - tmsrp_event_type_message, +typedef enum tmsrp_event_type_e { + tmsrp_event_type_none, + tmsrp_event_type_connected, + tmsrp_event_type_disconnected, + tmsrp_event_type_message, } tmsrp_event_type_t; -typedef struct tmsrp_event_s -{ - TSK_DECLARE_OBJECT; +typedef struct tmsrp_event_s { + TSK_DECLARE_OBJECT; - const void* callback_data; - unsigned outgoing:1; + const void* callback_data; + unsigned outgoing:1; - tmsrp_event_type_t type; - tmsrp_message_t* message; + tmsrp_event_type_t type; + tmsrp_message_t* message; } tmsrp_event_t; diff --git a/tinyMSRP/include/tinymsrp/tmsrp_message.h b/tinyMSRP/include/tinymsrp/tmsrp_message.h index a419d45..2045f32 100755 --- a/tinyMSRP/include/tinymsrp/tmsrp_message.h +++ b/tinyMSRP/include/tinymsrp/tmsrp_message.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -74,68 +74,65 @@ TMSRP_BEGIN_DECLS #define TMSRP_RESPONSE_IS_6XX(self) TMSRP_RESPONSE_IS_NXX(self, 6) #define TMSRP_RESPONSE_IS_23456(self) (TMSRP_MESSAGE_IS_RESPONSE((self)) && 200<= TMSRP_RESPONSE_CODE((self)) && TMSRP_RESPONSE_CODE((self)) <= 699) -/** Defines the message type (Request or Response). +/** Defines the message type (Request or Response). **/ -typedef enum tmsrp_message_type_e -{ - tmsrp_unknown, - tmsrp_request, - tmsrp_response +typedef enum tmsrp_message_type_e { + tmsrp_unknown, + tmsrp_request, + tmsrp_response } tmsrp_message_type_t; -typedef enum tmsrp_request_type_e -{ - tmsrp_NONE = 0, +typedef enum tmsrp_request_type_e { + tmsrp_NONE = 0, - tmsrp_SEND, - tmsrp_REPORT, - tmsrp_AUTH - //... + tmsrp_SEND, + tmsrp_REPORT, + tmsrp_AUTH + //... } tmsrp_request_type_t; -typedef struct tmsrp_message_s -{ - TSK_DECLARE_OBJECT; - - tmsrp_message_type_t type; - char* tid; - union{ - struct{ - char* method; - tmsrp_request_type_t type; - } request; - - struct{ - short status; - char* comment; - } response; - } line; - - // Very common headers - tmsrp_header_To_Path_t* To; - tmsrp_header_From_Path_t* From; - - tmsrp_header_Message_ID_t* MessageID; - - tmsrp_header_Byte_Range_t* ByteRange; - tmsrp_header_Failure_Report_t* FailureReport; - tmsrp_header_Success_Report_t* SuccessReport; - tmsrp_header_Status_t* Status; - - //! List of @ref tmsrp_header_t elements. - tmsrp_headers_L_t* headers; - - // Content - tmsrp_header_Content_Type_t* ContentType; - tsk_buffer_t *Content; - - // End line - struct{ - char* tid; - char cflag; - }end_line; +typedef struct tmsrp_message_s { + TSK_DECLARE_OBJECT; + + tmsrp_message_type_t type; + char* tid; + union { + struct { + char* method; + tmsrp_request_type_t type; + } request; + + struct { + short status; + char* comment; + } response; + } line; + + // Very common headers + tmsrp_header_To_Path_t* To; + tmsrp_header_From_Path_t* From; + + tmsrp_header_Message_ID_t* MessageID; + + tmsrp_header_Byte_Range_t* ByteRange; + tmsrp_header_Failure_Report_t* FailureReport; + tmsrp_header_Success_Report_t* SuccessReport; + tmsrp_header_Status_t* Status; + + //! List of @ref tmsrp_header_t elements. + tmsrp_headers_L_t* headers; + + // Content + tmsrp_header_Content_Type_t* ContentType; + tsk_buffer_t *Content; + + // End line + struct { + char* tid; + char cflag; + } end_line; } tmsrp_message_t; @@ -153,19 +150,19 @@ TINYMSRP_API int tmsrp_message_add_headers(tmsrp_message_t *self, ...); #if 0 static void TMSRP_MESSAGE_ADD_HEADER(tmsrp_message_t *self, ...) - { - va_list ap; - tmsrp_header_t *header; - const tsk_object_def_t *objdef; - - va_start(ap, self); - objdef = va_arg(ap, const tsk_object_def_t*); - header = tsk_object_new_2(objdef, &ap); - va_end(ap); - - tmsrp_message_add_header(self, header); - tsk_object_unref(header); - } +{ + va_list ap; + tmsrp_header_t *header; + const tsk_object_def_t *objdef; + + va_start(ap, self); + objdef = va_arg(ap, const tsk_object_def_t*); + header = tsk_object_new_2(objdef, &ap); + va_end(ap); + + tmsrp_message_add_header(self, header); + tsk_object_unref(header); +} #else #define TMSRP_MESSAGE_ADD_HEADER(self, objdef, ...) \ { \ diff --git a/tinyMSRP/include/tinymsrp/tmsrp_uri.h b/tinyMSRP/include/tinymsrp/tmsrp_uri.h index 61ae352..f4747a5 100755 --- a/tinyMSRP/include/tinymsrp/tmsrp_uri.h +++ b/tinyMSRP/include/tinymsrp/tmsrp_uri.h @@ -2,19 +2,19 @@ * Copyright (C) 2009 Mamadou Diop. * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -42,12 +42,11 @@ TMSRP_BEGIN_DECLS /** The type of the authority host. */ -typedef enum tmsrp_host_type_e -{ - tmsrp_host_unknown, - tmsrp_host_hostname, - tmsrp_host_ipv4, - tmsrp_host_ipv6 +typedef enum tmsrp_host_type_e { + tmsrp_host_unknown, + tmsrp_host_hostname, + tmsrp_host_ipv4, + tmsrp_host_ipv6 } tmsrp_host_type_t; @@ -56,21 +55,20 @@ tmsrp_host_type_t; * * @brief MSRP/MSRPS/TEL URI. **/ -typedef struct tmsrp_uri_s -{ - TSK_DECLARE_OBJECT; - - char *scheme; - struct{ - char* userinfo; - tmsrp_host_type_t host_type; /**< IPv4 or IPv6 or domain name. */ - char* host; - int32_t port; - }authority; - char* session_id; - char* transport; - - tsk_params_L_t *params; /**< list of @ref tsk_param_t elements containing all parameters. */ +typedef struct tmsrp_uri_s { + TSK_DECLARE_OBJECT; + + char *scheme; + struct { + char* userinfo; + tmsrp_host_type_t host_type; /**< IPv4 or IPv6 or domain name. */ + char* host; + int32_t port; + } authority; + char* session_id; + char* transport; + + tsk_params_L_t *params; /**< list of @ref tsk_param_t elements containing all parameters. */ } tmsrp_uri_t; |
