Changeset 2724 for pjproject/trunk/pjnath/include/pjnath/ice_session.h

Timestamp:

May 29, 2009 1:04:03 PM (15 years ago)

Author:

bennylp

Message:

Integration of Sipit24 branch, many tickets involved:

• #793: AMR encoder should regard 'mode-set' param specified by remote decoder.
• #831: Automatically switch to TCP transport when sending large request
• #832: Support for outbound proxy setting without using Route header
• #849: Modify conference audio switch behavior in connecting ports.
• #850: Remove 'Require=replaces' param in 'Refer-To' header (in call transfer with replaces).
• #851: Support for regular nomination in ICE
• #852: --ip-addr support for IPv6 for media transport in pjsua
• #854: Adding SOFTWARE attribute in all outgoing requests may cause compatibility problem with older STUN server (thanks Alexei Kuznetsov for the report)
• #855: Bug in digit map frequencies for DTMF digits (thanks FCCH for the report)
• #856: Put back the ICE candidate priority values according to the default values in the draft-mmusic-ice
• #857: Support for ICE keep-alive with Binding indication
• #858: Do not authenticate STUN 438 response
• #859: AMR-WB format param in the SDP is not negotiated correctly.
• #867: Return error instead of asserting when PJSUA-LIB fails to open log file

File:

• pjproject/trunk/pjnath/include/pjnath/ice_session.h (modified) (6 diffs)

pjproject/trunk/pjnath/include/pjnath/ice_session.h

@@ -177 +177 @@
 {
     /**
-     * The pointer to ICE check which was nominated for this component.
-     * The value will be NULL if a nominated check has not been found
-     * for this component.
+     * Pointer to ICE check with highest priority which connectivity check
+     * has been successful. The value will be NULL if a no successful check
+     * has not been found for this component.
      */
     pj_ice_sess_check   *valid_check;
+
+    /**
+     * Pointer to ICE check with highest priority which connectivity check
+     * has been successful and it has been nominated. The value may be NULL
+     * if there is no such check yet.
+     */
+    pj_ice_sess_check   *nominated_check;
 
     /**
@@ -554 +561 @@
 
 /**
+ * This structure describes various ICE session options. Application
+ * configure the ICE session with these options by calling 
+ * #pj_ice_sess_set_options().
+ */
+typedef struct pj_ice_sess_options
+{
+    /**
+     * Specify whether to use aggressive nomination.
+     */
+    pj_bool_t           aggressive;
+
+    /**
+     * For controlling agent if it uses regular nomination, specify the delay
+     * to perform nominated check (connectivity check with USE-CANDIDATE 
+     * attribute) after all components have a valid pair.
+     *
+     * Default value is PJ_ICE_NOMINATED_CHECK_DELAY.
+     */
+    unsigned            nominated_check_delay;
+
+    /**
+     * For a controlled agent, specify how long it wants to wait (in 
+     * milliseconds) for the controlling agent to complete sending 
+     * connectivity check with nominated flag set to true for all components
+     * after the controlled agent has found that all connectivity checks in
+     * its checklist have been completed and there is at least one successful
+     * (but not nominated) check for every component.
+     *
+     * Default value for this option is 
+     * ICE_CONTROLLED_AGENT_WAIT_NOMINATION_TIMEOUT. Specify -1 to disable
+     * this timer.
+     */
+    int                 controlled_agent_want_nom_timeout;
+
+} pj_ice_sess_options;
+
+
+/**
  * This structure describes the ICE session. For this version of PJNATH,
  * an ICE session corresponds to a single media stream (unlike the ICE
@@ -570 +615 @@
     pj_mutex_t          *mutex;                     /**< Mutex.             */
     pj_ice_sess_role     role;                      /**< ICE role.          */
+    pj_ice_sess_options  opt;                       /**< Options            */
     pj_timestamp         tie_breaker;               /**< Tie breaker value  */
     pj_uint8_t          *prefs;                     /**< Type preference.   */
+    pj_bool_t            is_nominating;             /**< Nominating stage   */
     pj_bool_t            is_complete;               /**< Complete?          */
     pj_status_t          ice_status;                /**< Error status.      */
-    pj_timer_entry       completion_timer;          /**< To call callback.  */
+    pj_timer_entry       timer;                     /**< ICE timer.         */
     pj_ice_sess_cb       cb;                        /**< Callback.          */
 
@@ -590 +637 @@
     unsigned             comp_cnt;                  /**< # of components.   */
     pj_ice_sess_comp     comp[PJ_ICE_MAX_COMP];     /**< Component array    */
+    unsigned             comp_ka;                   /**< Next comp for KA   */
 
     /* Local candidates */
@@ -655 +703 @@
                                      const pj_sockaddr *base_addr);
 
+/**
+ * Initialize ICE session options with library default values.
+ *
+ * @param opt           ICE session options.
+ */
+PJ_DECL(void) pj_ice_sess_options_default(pj_ice_sess_options *opt);
 
 /**
@@ -690 +744 @@
 
 /**
+ * Get the value of various options of the ICE session.
+ *
+ * @param ice           The ICE session.
+ * @param opt           The options to be initialized with the values
+ *                      from the ICE session.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error.
+ */
+PJ_DECL(pj_status_t) pj_ice_sess_get_options(pj_ice_sess *ice,
+                                             pj_ice_sess_options *opt);
+
+/**
+ * Specify various options for this ICE session. Application MUST only
+ * call this function after the ICE session has been created but before
+ * any connectivity check is started.
+ *
+ * Application should call #pj_ice_sess_get_options() to initialize the
+ * options with their default values.
+ *
+ * @param ice           The ICE session.
+ * @param opt           Options to be applied to the ICE session.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error.
+ */
+PJ_DECL(pj_status_t) pj_ice_sess_set_options(pj_ice_sess *ice,
+                                             const pj_ice_sess_options *opt);
+
+/**
  * Destroy ICE session. This will cancel any connectivity checks currently
  * running, if any, and any other events scheduled by this session, as well