Changeset 139 for pjproject/trunk/pjsip/include/pjsip/sip_event.h

Timestamp:

Feb 7, 2006 12:34:11 PM (18 years ago)

Author:

bennylp

Message:

Initial implementation of invite session abstraction, and updated pjsua for the new framework

File:

• pjproject/trunk/pjsip/include/pjsip/sip_event.h (modified) (5 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_event.h

@@ -58 +58 @@
     PJSIP_EVENT_TSX_STATE,
 
-    /** 2xx response received event. */
-    PJSIP_EVENT_RX_200_MSG,
-
-    /** ACK request received event. */
-    PJSIP_EVENT_RX_ACK_MSG,
-
-    /** Message discarded event. */
-    PJSIP_EVENT_DISCARD_MSG,
-
     /** Indicates that the event was triggered by user action. */
     PJSIP_EVENT_USER,
-
-    /** On before transmitting message. */
-    PJSIP_EVENT_PRE_TX_MSG,
 
 } pjsip_event_id_e;
@@ -141 +129 @@
         } tx_msg;
 
-        /** Pre-transmission event. */
-        struct
-        {
-            pjsip_tx_data       *tdata; /**< Msg to be transmitted.     */
-            pjsip_transaction   *tsx;   /**< The transaction.           */
-            int                  retcnt;/**< Retransmission count.      */
-        } pre_tx_msg;
-
         /** Transmission error event. */
         struct
@@ -162 +142 @@
             pjsip_transaction   *tsx;   /**< The transaction.           */
         } rx_msg;
-
-        /** Receipt of 200/INVITE response. */
-        struct
-        {
-            pjsip_rx_data       *rdata; /**< The 200 response msg.      */
-        } rx_200_msg;
-
-        /** Receipt of ACK message. */
-        struct
-        {
-            pjsip_rx_data       *rdata; /**< The ack message.           */
-        } rx_ack_msg;
-
-        /** Notification that endpoint has discarded a message. */
-        struct
-        {
-            pjsip_rx_data       *rdata; /**< The discarded message.     */
-            pj_status_t          reason;/**< The reason.                */
-        } discard_msg;
 
         /** User event. */
@@ -246 +207 @@
 
 /**
- * Init rx 200/INVITE event.
- */
-#define PJSIP_EVENT_INIT_RX_200_MSG(event,prdata)       \
-        do { \
-            (event).type = PJSIP_EVENT_RX_200_MSG;      \
-            (event).body.rx_200_msg.rdata = prdata;     \
-        } while (0)
-
-/**
- * Init rx ack msg event.
- */
-#define PJSIP_EVENT_INIT_RX_ACK_MSG(event,prdata)       \
-        do { \
-            (event).type = PJSIP_EVENT_RX_ACK_MSG;      \
-            (event).body.rx_ack_msg.rdata = prdata;     \
-        } while (0)
-
-/**
- * Init discard msg event.
- */
-#define PJSIP_EVENT_INIT_DISCARD_MSG(event,prdata,preason)  \
-        do { \
-            (event).type = PJSIP_EVENT_DISCARD_MSG;         \
-            (event).body.discard_msg.rdata = prdata;        \
-            (event).body.discard_msg.reason = preason;      \
-        } while (0)
-
-/**
  * Init user event.
  */
@@ -286 +219 @@
 
 /**
- * Init pre tx msg event.
- */
-#define PJSIP_EVENT_INIT_PRE_TX_MSG(event,ptsx,ptdata,pretcnt) \
-        do { \
-            (event).type = PJSIP_EVENT_PRE_TX_MSG;      \
-            (event).body.pre_tx_msg.tsx = ptsx;         \
-            (event).body.pre_tx_msg.tdata = ptdata;     \
-            (event).body.pre_tx_msg.retcnt = pretcnt;   \
-        } while (0)
-
-
-/**
  * Get the event string from the event ID.
  * @param e the event ID.