Changeset 1748 for pjproject/trunk
- Timestamp:
- Jan 25, 2008 4:06:33 PM (17 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 32 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjlib-util/docs/doxygen.cfg
r754 r1748 844 844 PREDEFINED = PJ_DECL(x)=x PJ_DEF(x)=x PJ_IDECL(x)=x \ 845 845 PJ_IDEF(x)=x PJ_INLINE(x)=x \ 846 PJ_DECL_DATA(x)=x \ 846 847 PJ_DECL_NO_RETURN(x)=x \ 848 PJ_NO_RETURN=x \ 847 849 PJ_HAS_HIGH_RES_TIMER=1 \ 848 850 PJ_LOG_MAX_LEVEL=4 \ 849 851 PJ_HAS_SEMAPHORE=1 \ 850 PJ_HAS_EVENT_OBJ=1 852 PJ_HAS_EVENT_OBJ=1 \ 853 PJ_HAS_TCP=1 854 851 855 852 856 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -
pjproject/trunk/pjlib-util/include/pjlib-util/md5.h
r1374 r1748 39 39 typedef struct pj_md5_context 40 40 { 41 pj_uint32_t buf[4]; 42 pj_uint32_t bits[2]; 43 pj_uint8_t in[64]; 41 pj_uint32_t buf[4]; /**< buf */ 42 pj_uint32_t bits[2]; /**< bits */ 43 pj_uint8_t in[64]; /**< in */ 44 44 } pj_md5_context; 45 45 -
pjproject/trunk/pjlib-util/include/pjlib-util/scanner_cis_uint.h
r1374 r1748 46 46 typedef struct pj_cis_t 47 47 { 48 PJ_CIS_ELEM_TYPE cis_buf[256]; 48 PJ_CIS_ELEM_TYPE cis_buf[256]; /**< Internal buffer. */ 49 49 } pj_cis_t; 50 50 -
pjproject/trunk/pjlib-util/include/pjlib-util/sha1.h
r1374 r1748 38 38 typedef struct pj_sha1_context 39 39 { 40 pj_uint32_t state[5]; 41 pj_uint32_t count[2]; 42 pj_uint8_t buffer[64]; 40 pj_uint32_t state[5]; /**< State */ 41 pj_uint32_t count[2]; /**< Count */ 42 pj_uint8_t buffer[64]; /**< Buffer */ 43 43 } pj_sha1_context; 44 44 -
pjproject/trunk/pjlib-util/include/pjlib-util/srv_resolver.h
r1590 r1748 33 33 * @{ 34 34 * 35 * \s ubsection PJ_DNS_SRV_RESOLVER_INTRO DNS SRV Resolution Helper35 * \section PJ_DNS_SRV_RESOLVER_INTRO DNS SRV Resolution Helper 36 36 * 37 37 * This module provides an even higher layer of abstraction for the DNS -
pjproject/trunk/pjlib-util/include/pjlib-util/xml.h
r1374 r1748 95 95 */ 96 96 PJ_DECL(int) pj_xml_print( const pj_xml_node *node, char *buf, pj_size_t len, 97 pj_bool_t include_prolog);97 pj_bool_t prolog); 98 98 99 99 /** … … 124 124 * @param pool Pool. 125 125 * @param name Attribute name. 126 * @param attrAttribute value.126 * @param value Attribute value. 127 127 * 128 128 * @return The new XML attribute. … … 162 162 * 163 163 * @param parent Parent node. 164 * @param node node->next is the starting point. 164 165 * @param name Node name to find. 165 166 * … … 185 186 * Find a direct child node with the specified name and match the function. 186 187 * 187 * @param nodeParent node.188 * @param parent Parent node. 188 189 * @param name Optional name. 189 190 * @param data Data to be passed to matching function. -
pjproject/trunk/pjlib/docs/doxygen.cfg
r1595 r1748 844 844 PREDEFINED = PJ_DECL(x)=x PJ_DEF(x)=x PJ_IDECL(x)=x \ 845 845 PJ_IDEF(x)=x PJ_INLINE(x)=x \ 846 PJ_DECL_DATA(x)=x \ 846 847 PJ_DECL_NO_RETURN(x)=x \ 848 PJ_NO_RETURN=x \ 847 849 PJ_HAS_HIGH_RES_TIMER=1 \ 848 850 PJ_LOG_MAX_LEVEL=4 \ -
pjproject/trunk/pjlib/include/pj/config.h
r1649 r1748 450 450 451 451 /** 452 * \def PJ_HAS_TCP453 452 * Support TCP in the library. 454 453 * Disabling TCP will reduce the footprint slightly (about 6KB). … … 461 460 462 461 /** 463 * \def PJ_HAS_IPV6464 462 * Support IPv6 in the library. If this support is disabled, some IPv6 465 463 * related functions will return PJ_EIPV6NOTSUP. … … 847 845 */ 848 846 /** 847 * @def PJ_IDECL_NO_RETURN(type) 848 * @param type The return type of the function. 849 * Declare an inline function that will not return. 850 */ 851 /** 849 852 * @def PJ_BEGIN_DECL 850 853 * Mark beginning of declaration section in a header file. -
pjproject/trunk/pjlib/include/pj/errno.h
r1601 r1748 112 112 char *buf, pj_size_t bufsize); 113 113 114 typedef pj_str_t (*pjsip_error_callback)(pj_status_t, char*, pj_size_t); 114 /** 115 * Type of callback to be specified in #pj_register_strerror() 116 * 117 * @param e The error code to lookup. 118 * @param msg Buffer to store the error message. 119 * @param max Length of the buffer. 120 * 121 * @return The error string. 122 */ 123 typedef pj_str_t (*pj_error_callback)(pj_status_t e, char *msg, pj_size_t max); 124 125 115 126 /** 116 127 * Register strerror message handler for the specified error space. … … 134 145 PJ_DECL(pj_status_t) pj_register_strerror(pj_status_t start_code, 135 146 pj_status_t err_space, 136 pj sip_error_callback f);147 pj_error_callback f); 137 148 138 149 /** -
pjproject/trunk/pjlib/include/pj/ioqueue.h
r1405 r1748 167 167 168 168 /** 169 * This callback is called when #pj_ioqueue_ writeor #pj_ioqueue_sendto169 * This callback is called when #pj_ioqueue_send or #pj_ioqueue_sendto 170 170 * completes. 171 171 * -
pjproject/trunk/pjlib/include/pj/pool.h
r1417 r1748 613 613 614 614 /** 615 * \def PJ_NO_MEMORY_EXCEPTION 615 616 * This constant denotes the exception number that will be thrown by default 616 617 * memory factory policy when memory allocation fails. -
pjproject/trunk/pjlib/src/pj/errno.c
r1601 r1748 107 107 PJ_DEF(pj_status_t) pj_register_strerror( pj_status_t start, 108 108 pj_status_t space, 109 pj sip_error_callback f)109 pj_error_callback f) 110 110 { 111 111 unsigned i; -
pjproject/trunk/pjmedia/docs/doxygen.cfg
r783 r1748 844 844 PREDEFINED = PJ_DECL(x)=x PJ_DEF(x)=x PJ_IDECL(x)=x \ 845 845 PJ_IDEF(x)=x PJ_INLINE(x)=x \ 846 PJ_BEGIN_DECL= PJ_END_DECL= \ 847 PJMEDIA_HAS_MP3_WRITER=1 846 PJ_DECL_DATA(x)=x \ 847 PJ_DECL_NO_RETURN(x)=x \ 848 PJ_NO_RETURN=x \ 849 PJ_HAS_HIGH_RES_TIMER=1 \ 850 PJ_LOG_MAX_LEVEL=4 \ 851 PJ_HAS_SEMAPHORE=1 \ 852 PJ_HAS_EVENT_OBJ=1 \ 853 PJ_HAS_TCP=1 \ 854 PJMEDIA_HAS_SRTP=1 848 855 849 856 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -
pjproject/trunk/pjmedia/include/pjmedia/transport.h
r1735 r1748 57 57 * #pjmedia_transport_op directly. 58 58 * 59 * The connection between \ref PJMED_STRM and media transport is shown in 60 * the diagram below: 61 62 \image html media-transport.PNG 63 64 59 65 * \section PJMEDIA_TRANSPORT_H_USING Using the Media Transport 60 66 * … … 136 142 * 137 143 * 144 * \section PJMEDIA_TRANSPORT_H_EXT Media Transport Extended API 145 146 Apart from the basic interface above, the media transport provides some 147 more APIs: 148 149 - pjmedia_transport_media_create() 150 \n 151 This API is provided to allow the media transport to add more information 152 in the SDP offer, before the offer is sent to remote. Additionally, for 153 answerer side, this callback allows the media transport to reject the 154 offer before this offer is processed by the SDP negotiator. 155 156 - pjmedia_transport_media_start() 157 \n 158 This API should be called after offer and answer are negotiated, and 159 both SDPs are available, and before the media is started. For answerer 160 side, this callback will be called before the answer is sent to remote, 161 to allow media transport to put additional info in the SDP. For 162 offerer side, this callback will be called after SDP answer is 163 received. In this callback, the media transport has the final chance 164 to negotiate/validate the offer and answer before media is really 165 started (and answer is sent, for answerer side). 166 167 - pjmedia_transport_media_stop() 168 \n 169 This API should be called when the media is stopped, to allow the media 170 transport to release its resources. 171 172 - pjmedia_transport_simulate_lost() 173 \n 174 This API can be used to instruct media transport to simulate packet lost 175 on a particular direction. 176 138 177 * \section PJMEDIA_TRANSPORT_H_IMPL Implementing Media Transport 139 178 * … … 169 208 #include <pjmedia/sdp.h> 170 209 171 /* 210 /** 172 211 * Forward declaration for media transport. 173 212 */ … … 459 498 * Remote SDP might be needed as reference when application is in deciding 460 499 * side of negotiation (callee side), otherwise it should be NULL. 500 * 501 * This API is provided to allow the media transport to add more information 502 * in the SDP offer, before the offer is sent to remote. Additionally, for 503 * answerer side, this callback allows the media transport to reject the 504 * offer before this offer is processed by the SDP negotiator. 505 * 461 506 * This is just a simple wrapper which calls <tt>media_create()</tt> member 462 507 * of the transport. … … 466 511 * @param sdp_local Local SDP. 467 512 * @param sdp_remote Remote SDP. 513 * @param media_index Media index in SDP. 468 514 * 469 515 * @return PJ_SUCCESS on success, or the appropriate error code. … … 481 527 /** 482 528 * Start the transport with regards to SDP negotiation result. 529 * This API should be called after offer and answer are negotiated, and 530 * both SDPs are available, and before the media is started. For answerer 531 * side, this callback will be called before the answer is sent to remote, 532 * to allow media transport to put additional info in the SDP. For 533 * offerer side, this callback will be called after SDP answer is 534 * received. In this callback, the media transport has the final chance 535 * to negotiate/validate the offer and answer before media is really 536 * started (and answer is sent, for answerer side). 537 * 483 538 * This is just a simple wrapper which calls <tt>media_start()</tt> member 484 539 * of the transport. … … 504 559 /** 505 560 * Stop the transport. 561 * This API should be called when the media is stopped, to allow the media 562 * transport to release its resources. 563 * 506 564 * This is just a simple wrapper which calls <tt>media_stop()</tt> member 507 565 * of the transport. -
pjproject/trunk/pjmedia/include/pjmedia/transport_srtp.h
r1735 r1748 22 22 /** 23 23 * @file srtp.h 24 * @brief transport SRTP encapsulates secure mediatransport.24 * @brief Secure RTP (SRTP) transport. 25 25 */ 26 26 27 27 #include <pjmedia/transport.h> 28 28 29 30 /** 31 * @defgroup PJMEDIA_TRANSPORT_SRTP Secure RTP (SRTP) Transport Adapter 32 * @ingroup PJMEDIA_TRANSPORT 33 * @brief Media transport adapter to add SRTP feature to existing transports 34 * @{ 35 * 36 * This module implements SRTP as described by RFC 3711, using RFC 4568 as 37 * key exchange method. It implements \ref PJMEDIA_TRANSPORT_H to integrate 38 * with the rest of PJMEDIA framework. 39 * 40 * As we know, media transport is separated from the stream object (which 41 * does the encoding/decoding of PCM frames, (de)packetization of RTP/RTCP 42 * packets, and de-jitter buffering). The connection between stream and media 43 * transport is established when the stream is created (we need to specify 44 * media transport during stream creation), and the interconnection can be 45 * depicted from the diagram below: 46 * 47 \image html media-transport.PNG 48 49 * I think the diagram above is self-explanatory. 50 * 51 * SRTP functionality is implemented as some kind of "adapter", which is 52 * plugged between the stream and the actual media transport that does 53 * sending/receiving RTP/RTCP packets. When SRTP is used, the interconnection 54 * between stream and transport is like the diagram below: 55 * 56 \image html media-srtp-transport.PNG 57 58 * So to stream, the SRTP transport behaves as if it is a media transport 59 * (because it is a media transport), and to the media transport it behaves 60 * as if it is a stream. The SRTP object then forwards RTP packets back and 61 * forth between stream and the actual transport, encrypting/decrypting 62 * the RTP/RTCP packets as necessary. 63 * 64 * The neat thing about this design is the SRTP "adapter" then can be used 65 * to encrypt any kind of media transports. We currently have UDP and ICE 66 * media transports that can benefit SRTP, and we could add SRTP to any 67 * media transports that will be added in the future. 68 */ 29 69 30 70 PJ_BEGIN_DECL … … 56 96 pj_str_t name; 57 97 58 /* Flags, bitmask from #pjmedia_srtp_crypto_option */98 /** Flags, bitmask from #pjmedia_srtp_crypto_option */ 59 99 unsigned flags; 60 100 … … 169 209 */ 170 210 PJ_DECL(pj_status_t) pjmedia_transport_srtp_start( 171 pjmedia_transport * tp,211 pjmedia_transport *srtp, 172 212 const pjmedia_srtp_crypto *tx, 173 213 const pjmedia_srtp_crypto *rx); … … 182 222 * @see #pjmedia_transport_srtp_start() 183 223 */ 184 PJ_DECL(pj_status_t) pjmedia_transport_srtp_stop(pjmedia_transport * tp);224 PJ_DECL(pj_status_t) pjmedia_transport_srtp_stop(pjmedia_transport *srtp); 185 225 186 226 … … 193 233 */ 194 234 PJ_DECL(pjmedia_transport*) pjmedia_transport_srtp_get_member( 195 pjmedia_transport * tp);235 pjmedia_transport *srtp); 196 236 197 237 198 238 PJ_END_DECL 199 239 240 /** 241 * @} 242 */ 243 200 244 #endif /* __PJMEDIA_TRANSPORT_SRTP_H__ */ -
pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c
r1735 r1748 749 749 PJ_UNUSED_ARG(sdp_local); 750 750 PJ_UNUSED_ARG(sdp_remote); 751 PJ_UNUSED_ARG(media_index); 751 752 752 753 return PJ_SUCCESS; -
pjproject/trunk/pjsip/docs/doxygen.cfg
r690 r1748 368 368 # subdirectory from a directory tree whose root is specified with the INPUT tag. 369 369 370 EXCLUDE = *_i.h 370 EXCLUDE = *_i.h pjsua_internal.h 371 371 372 372 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories … … 845 845 846 846 PREDEFINED = PJ_DECL(x)=x PJ_DEF(x)=x PJ_IDECL(x)=x \ 847 PJ_IDEF(x)=x PJ_INLINE(x)=x 847 PJ_IDEF(x)=x PJ_INLINE(x)=x PJ_DECL_DATA(x)=x \ 848 PJMEDIA_HAS_SRTP=1 848 849 849 850 -
pjproject/trunk/pjsip/include/pjsip-simple/evsub.h
r1417 r1748 21 21 22 22 /** 23 * @file ev ent_notify.h23 * @file evsub.h 24 24 * @brief SIP Specific Event Notification Extension (RFC 3265) 25 25 */ … … 133 133 * However, implementation MUST send NOTIFY request upon receiving this 134 134 * callback. The suggested behavior is to call 135 * #pjsip_evsub_ last_notify(), since this function takes care135 * #pjsip_evsub_current_notify(), since this function takes care 136 136 * about unsubscription request and calculates the appropriate expiration 137 137 * interval. -
pjproject/trunk/pjsip/include/pjsip-simple/evsub_msg.h
r1417 r1748 21 21 22 22 /** 23 * @file ev ent_notify_msg.h23 * @file evsub_msg.h 24 24 * @brief SIP Event Notification Headers (RFC 3265) 25 25 */ -
pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h
r1733 r1748 496 496 * Create the initial response message for the incoming INVITE request in 497 497 * rdata with status code st_code and optional status text st_text. Use 498 * #pjsip_ answer() to create subsequent response message.498 * #pjsip_inv_answer() to create subsequent response message. 499 499 */ 500 500 PJ_DECL(pj_status_t) pjsip_inv_initial_answer( pjsip_inv_session *inv, -
pjproject/trunk/pjsip/include/pjsip-ua/sip_regc.h
r1561 r1748 21 21 22 22 /** 23 * @file sip_reg .h23 * @file sip_regc.h 24 24 * @brief SIP Registration Client 25 25 */ -
pjproject/trunk/pjsip/include/pjsip/sip_auth.h
r1561 r1748 31 31 32 32 /** 33 * @addtogroup PJSIP_AUTH Authentication Framework33 * @addtogroup PJSIP_AUTH 34 34 * @ingroup PJSIP_CORE 35 35 * @brief Client and server side authentication framework. -
pjproject/trunk/pjsip/include/pjsip/sip_auth_parser.h
r974 r1748 21 21 22 22 /** 23 * @file pjsip_auth_parser.h23 * @file sip_auth_parser.h 24 24 * @brief SIP Authorization Parser Module. 25 25 */ -
pjproject/trunk/pjsip/include/pjsip/sip_config.h
r1575 r1748 352 352 * Note that even when this setting is enabled, asynchronous DNS resolution 353 353 * will only be done when application calls #pjsip_endpt_create_resolver(), 354 * configure the nameservers with #pj_dns_resolver_set_ns(), and configure354 * configure the nameservers with pj_dns_resolver_set_ns(), and configure 355 355 * the SIP endpoint's DNS resolver with #pjsip_endpt_set_resolver(). If 356 356 * these steps are not followed, the domain will be resolved with normal -
pjproject/trunk/pjsip/include/pjsip/sip_dialog.h
r1537 r1748 22 22 23 23 /** 24 * @file dialog.h24 * @file sip_dialog.h 25 25 * @brief SIP Dialog abstraction 26 26 */ -
pjproject/trunk/pjsip/include/pjsip/sip_endpoint.h
r1098 r1748 225 225 226 226 /** 227 * Create a new transaction. After creating the transaction, application MUST228 * initialize the transaction as either UAC or UAS (by calling229 * #pjsip_tsx_init_uac or #pjsip_tsx_init_uas), then must register the230 * transaction to endpoint with #pjsip_endpt_register_tsx.231 * This function, like all other endpoint functions, is thread safe.232 *233 * @param endpt The SIP endpoint.234 * @param p_tsx Pointer to receive the transaction.235 *236 * @return PJ_SUCCESS or the appropriate error code.237 */238 PJ_DECL(pj_status_t) pjsip_endpt_create_tsx(pjsip_endpoint *endpt,239 pjsip_transaction **p_tsx);240 241 /**242 227 * Find transaction in endpoint's transaction table by the transaction's key. 243 228 * This function normally is only used by modules. The key for a transaction -
pjproject/trunk/pjsip/include/pjsip/sip_msg.h
r1461 r1748 1033 1033 unsigned count; 1034 1034 1035 /** <Tags/elements. */1035 /** Tags/elements. */ 1036 1036 pj_str_t values[PJSIP_GENERIC_ARRAY_MAX_COUNT]; 1037 1037 -
pjproject/trunk/pjsip/include/pjsip/sip_resolve.h
r974 r1748 210 210 * internally by pjsip_endpoint instance. 211 211 * 212 * @param p f The Pool Factory.212 * @param pool Pool to allocate memory from. 213 213 * @param p_res Pointer to receive SIP resolver instance. 214 214 * -
pjproject/trunk/pjsip/include/pjsip/sip_transaction.h
r1594 r1748 361 361 PJ_DECL(void) pjsip_tsx_layer_dump(pj_bool_t detail); 362 362 363 /* 363 /** 364 364 * Get the string name for the state. 365 * @param state State 365 366 */ 366 367 PJ_DECL(const char *) pjsip_tsx_state_str(pjsip_tsx_state_e state); 367 368 368 /* 369 /** 369 370 * Get the role name. 371 * @param role Role. 370 372 */ 371 373 PJ_DECL(const char *) pjsip_role_name(pjsip_role_e role); -
pjproject/trunk/pjsip/include/pjsip/sip_transport.h
r1602 r1748 920 920 * 921 921 *****************************************************************************/ 922 typedef void (*pjsip_rx_callback)(pjsip_endpoint*, pj_status_t, pjsip_rx_data *); 923 typedef pj_status_t (*pjsip_tx_callback)(pjsip_endpoint*, pjsip_tx_data*); 922 923 /** 924 * Type of callback to be called when transport manager receives incoming 925 * SIP message. 926 * 927 * @param ep Endpoint. 928 * @param status Receiption status. 929 * @param rd Received packet. 930 */ 931 typedef void (*pjsip_rx_callback)(pjsip_endpoint *ep, pj_status_t status, 932 pjsip_rx_data *rd); 933 934 /** 935 * Type of callback to be called before transport manager is about 936 * to transmit SIP message. 937 * 938 * @param ep Endpoint. 939 * @param td Transmit data. 940 */ 941 typedef pj_status_t (*pjsip_tx_callback)(pjsip_endpoint *ep, pjsip_tx_data*td); 942 924 943 /** 925 944 * Create a transport manager. Normally application doesn't need to call -
pjproject/trunk/pjsip/include/pjsip/sip_util.h
r1388 r1748 260 260 261 261 262 typedef void (*pjsip_send_callback)(pjsip_send_state*, pj_ssize_t sent, 262 /** 263 * Declaration for callback function to be specified in 264 * #pjsip_endpt_send_request_stateless(), #pjsip_endpt_send_response(), or 265 * #pjsip_endpt_send_response2(). 266 * 267 * @param st Structure to keep transmission state. 268 * @param sent Number of bytes sent. 269 * @param cont When current transmission fails, specify whether 270 * the function should fallback to next destination. 271 */ 272 typedef void (*pjsip_send_callback)(pjsip_send_state *st, pj_ssize_t sent, 263 273 pj_bool_t *cont); 264 274 … … 518 528 pjsip_transaction **p_tsx ); 519 529 520 typedef void (*pjsip_endpt_send_callback)(void*, pjsip_event*); 530 /** 531 * Type of callback to be specified in #pjsip_endpt_send_request(). 532 * 533 * @param token The token that was given in #pjsip_endpt_send_request() 534 * @param e Completion event. 535 */ 536 typedef void (*pjsip_endpt_send_callback)(void *token, pjsip_event *e); 537 521 538 /** 522 539 * Send outgoing request and initiate UAC transaction for the request. -
pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h
r1735 r1748 1105 1105 1106 1106 1107 /* The implementation has been moved to sip_auth.h */1107 /** The implementation has been moved to sip_auth.h */ 1108 1108 #define pjsip_cred_dup pjsip_cred_info_dup 1109 1109 … … 1198 1198 1199 1199 1200 /* Forward declaration */1200 /** Forward declaration */ 1201 1201 typedef struct pjsua_media_config pjsua_media_config; 1202 1202 … … 3394 3394 * session immediately. 3395 3395 * 3396 * @param buddy )cfg Buddy configuration.3396 * @param buddy_cfg Buddy configuration. 3397 3397 * @param p_buddy_id Pointer to receive buddy ID. 3398 3398 * … … 4450 4450 * @param tail_ms The tail length, in miliseconds. Set to zero to 4451 4451 * disable AEC. 4452 * @param options Options to be passed to #pjmedia_echo_create().4452 * @param options Options to be passed to pjmedia_echo_create(). 4453 4453 * Normally the value should be zero. 4454 4454 *
Note: See TracChangeset
for help on using the changeset viewer.