osip.h   osip.h 
skipping to change at line 314 skipping to change at line 314
* Structure for SRV record entry. * Structure for SRV record entry.
* @struct osip_srv_entry * @struct osip_srv_entry
*/ */
struct osip_srv_entry { struct osip_srv_entry {
char srv[512]; char srv[512];
int priority; int priority;
int weight; int weight;
int rweight; int rweight;
int port; int port;
char ipaddress[512];
}; };
#define OSIP_SRV_STATE_UNKNOWN 0
/* #define OSIP_SRV_STATE_INPROGRESS 1 */
#define OSIP_SRV_STATE_RETRYLATER 2
#define OSIP_SRV_STATE_COMPLETED 3
#define OSIP_SRV_STATE_NOTSUPPORTED 4
/** /**
* Structure for SRV record. * Structure for SRV record.
* @var osip_srv_record_t * @var osip_srv_record_t
*/ */
typedef struct osip_srv_record osip_srv_record_t; typedef struct osip_srv_record osip_srv_record_t;
/** /**
* Structure for SRV record entry. * Structure for SRV record entry.
* @struct osip_srv_record * @struct osip_srv_record
*/ */
struct osip_srv_record { struct osip_srv_record {
char name[512]; char name[512];
int srv_state;
char protocol[64]; char protocol[64];
struct osip_srv_entry srventry[10]; int order;
int preference;
int index;
osip_srv_entry_t srventry[10];
}; };
#define OSIP_NAPTR_STATE_UNKNOWN 0
#define OSIP_NAPTR_STATE_INPROGRESS 1
#define OSIP_NAPTR_STATE_NAPTRDONE 2
#define OSIP_NAPTR_STATE_SRVINPROGRESS 3
#define OSIP_NAPTR_STATE_SRVDONE 4
#define OSIP_NAPTR_STATE_RETRYLATER 5
#define OSIP_NAPTR_STATE_NOTSUPPORTED 6
/**
* Structure for NAPTR record.
* @var osip_naptr_t
*/
typedef struct osip_naptr osip_naptr_t;
/**
* Structure for NAPTR record entry.
* @struct osip_naptr
*/
struct osip_naptr {
char domain[512];
int naptr_state;
void *arg;
int keep_in_cache;
struct osip_srv_record sipudp_record;
struct osip_srv_record siptcp_record;
struct osip_srv_record siptls_record;
struct osip_srv_record sipdtls_record;
struct osip_srv_record sipsctp_record;
};
/** /**
* Structure for transaction handling. * Structure for transaction handling.
* @var osip_transaction_t * @var osip_transaction_t
*/ */
typedef struct osip_transaction osip_transaction_t; typedef struct osip_transaction osip_transaction_t;
/** /**
* Structure for transaction handling * Structure for transaction handling
* @struct osip_transaction * @struct osip_transaction
*/ */
skipping to change at line 381 skipping to change at line 422
osip_fsm_type_t ctx_type; osip_fsm_type_t ctx_type;
/**< Type of the transaction */ /**< Type of the transaction */
osip_ict_t *ict_context;/**@internal */ osip_ict_t *ict_context;/**@internal */
osip_ist_t *ist_context;/**@internal */ osip_ist_t *ist_context;/**@internal */
osip_nict_t *nict_context; osip_nict_t *nict_context;
/**@internal */ /**@internal */
osip_nist_t *nist_context; osip_nist_t *nist_context;
/**@internal */ /**@internal */
osip_srv_record_t record; osip_srv_record_t record;
osip_naptr_t *naptr_record;
/**@internal */ /**@internal */
}; };
/** /**
* Enumeration for callback type. * Enumeration for callback type.
*/ */
typedef enum osip_message_callback_type { typedef enum osip_message_callback_type {
OSIP_ICT_INVITE_SENT = 0, /**< INVITE MESSAGE SENT */ OSIP_ICT_INVITE_SENT = 0, /**< INVITE MESSAGE SENT */
OSIP_ICT_INVITE_SENT_AGAIN, /**< INVITE MESSAGE RETRANSMITTED */ OSIP_ICT_INVITE_SENT_AGAIN, /**< INVITE MESSAGE RETRANSMITTED */
OSIP_ICT_ACK_SENT, /**< ACK MESSAGE SENT */ OSIP_ICT_ACK_SENT, /**< ACK MESSAGE SENT */
skipping to change at line 732 skipping to change at line 774
int osip_transaction_get_destination(osip_transaction_t * transactio n, int osip_transaction_get_destination(osip_transaction_t * transactio n,
char **ip, int *port); char **ip, int *port);
/** /**
* Set SRV lookup information to be used by state machine. * Set SRV lookup information to be used by state machine.
* *
* @param transaction The element to work on. * @param transaction The element to work on.
* @param record The SRV lookup results for this transaction. * @param record The SRV lookup results for this transaction.
*/ */
int osip_transaction_set_srv_record(osip_transaction_t * transaction , int osip_transaction_set_srv_record(osip_transaction_t * transaction ,
osip_srv_record_t * record);
osip_srv_record_t * record);
/**
* Set NAPTR lookup information to be used by state machine.
*
* @param transaction The element to work on.
* @param record The NAPTR lookup results for this transaction.
*/
int osip_transaction_set_naptr_record(osip_transaction_t * transacti
on,
osip_naptr_t * record);
/** /**
* Set the socket for incoming message. * Set the socket for incoming message.
* *
* @param transaction The element to work on. * @param transaction The element to work on.
* @param sock The socket for incoming message. * @param sock The socket for incoming message.
*/ */
int osip_transaction_set_in_socket(osip_transaction_t * transaction, int sock); int osip_transaction_set_in_socket(osip_transaction_t * transaction, int sock);
/** /**
* Set the socket for outgoing message. * Set the socket for outgoing message.
 End of changes. 7 change blocks. 
3 lines changed or deleted 54 lines changed or added


 osip_dialog.h   osip_dialog.h 
skipping to change at line 61 skipping to change at line 61
typedef struct osip_dialog osip_dialog_t; typedef struct osip_dialog osip_dialog_t;
/** /**
* Structure for referencing a dialog. * Structure for referencing a dialog.
* @struct osip_dialog * @struct osip_dialog
*/ */
struct osip_dialog { struct osip_dialog {
char *call_id; /**< Call-I D*/ char *call_id; /**< Call-I D*/
char *local_tag; /**< local tag */ char *local_tag; /**< local tag */
char *remote_tag; /**< remote tag */ char *remote_tag; /**< remote tag */
char *line_param; /**< line p aram from request uri for incoming calls */
osip_list_t route_set; /**< route set */ osip_list_t route_set; /**< route set */
int local_cseq; /**< last l ocal cseq */ int local_cseq; /**< last l ocal cseq */
int remote_cseq; /**< last r emote cseq*/ int remote_cseq; /**< last r emote cseq*/
osip_to_t *remote_uri; /**< remote_uri */ osip_to_t *remote_uri; /**< remote_uri */
osip_from_t *local_uri; /**< local_uri */ osip_from_t *local_uri; /**< local_uri */
osip_contact_t *remote_contact_uri; osip_contact_t *remote_contact_uri;
/**< remote contact_uri */ /**< remote contact_uri */
int secure; /** < use secure transport layer */ int secure; /** < use secure transport layer */
osip_dialog_type_t type; /**< type of dialog (CALLEE or CALLER) */ osip_dialog_type_t type; /**< type of dialog (CALLEE or CALLER) */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/