Updated libs
This commit is contained in:
parent
3cee5be7b2
commit
024bbb0592
|
@ -960,7 +960,7 @@ static int osmo_cc_handle_endpoint(osmo_cc_endpoint_t *ep)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* main handler
|
/* main handler
|
||||||
* note that it must be called in a loop (with ohter handlers) until no work was done
|
* note that it must be called in a loop (with other handlers) until no work was done
|
||||||
*/
|
*/
|
||||||
int osmo_cc_handle(void)
|
int osmo_cc_handle(void)
|
||||||
{
|
{
|
||||||
|
@ -1071,7 +1071,7 @@ static void osmo_cc_help_address(void)
|
||||||
printf("remote [<IPv6 address>]:<port>\n\n");
|
printf("remote [<IPv6 address>]:<port>\n\n");
|
||||||
|
|
||||||
printf("These options can be used to define local and remote IP and port for the socket\n");
|
printf("These options can be used to define local and remote IP and port for the socket\n");
|
||||||
printf("interface. Note that IPv6 adresses must be enclosed by '[' and ']'.\n\n");
|
printf("interface. Note that IPv6 addresses must be enclosed by '[' and ']'.\n\n");
|
||||||
|
|
||||||
printf("If no local address was given, the IPv4 loopback IP and port %d is used. If\n", OSMO_CC_DEFAULT_PORT);
|
printf("If no local address was given, the IPv4 loopback IP and port %d is used. If\n", OSMO_CC_DEFAULT_PORT);
|
||||||
printf("this port is already in use, the first free higher port is used.\n\n");
|
printf("this port is already in use, the first free higher port is used.\n\n");
|
||||||
|
|
|
@ -109,7 +109,7 @@ osmo_cc_msg_t *osmo_cc_new_msg(uint8_t msg_type)
|
||||||
PDEBUG(DCC, DEBUG_ERROR, "No memory\n");
|
PDEBUG(DCC, DEBUG_ERROR, "No memory\n");
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
/* set message type and zero lentgh */
|
/* set message type and zero length */
|
||||||
msg->type = msg_type;
|
msg->type = msg_type;
|
||||||
msg->length_networkorder = htons(0);
|
msg->length_networkorder = htons(0);
|
||||||
|
|
||||||
|
@ -831,7 +831,7 @@ int osmo_cc_get_ie_sdp(osmo_cc_msg_t *msg, int ie_repeat, char *sdp, size_t sdp_
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* helper to encode socket addresss */
|
/* helper to encode socket address */
|
||||||
void osmo_cc_add_ie_socket_address(osmo_cc_msg_t *msg, const char *address)
|
void osmo_cc_add_ie_socket_address(osmo_cc_msg_t *msg, const char *address)
|
||||||
{
|
{
|
||||||
struct osmo_cc_ie_socket_address *ie_socket_address;
|
struct osmo_cc_ie_socket_address *ie_socket_address;
|
||||||
|
@ -840,7 +840,7 @@ void osmo_cc_add_ie_socket_address(osmo_cc_msg_t *msg, const char *address)
|
||||||
memcpy(ie_socket_address->address, address, strlen(address));
|
memcpy(ie_socket_address->address, address, strlen(address));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* helper to decode socket addresss */
|
/* helper to decode socket address */
|
||||||
int osmo_cc_get_ie_socket_address(osmo_cc_msg_t *msg, int ie_repeat, char *address, size_t address_size)
|
int osmo_cc_get_ie_socket_address(osmo_cc_msg_t *msg, int ie_repeat, char *address, size_t address_size)
|
||||||
{
|
{
|
||||||
struct osmo_cc_ie_socket_address *ie_socket_address;
|
struct osmo_cc_ie_socket_address *ie_socket_address;
|
||||||
|
|
|
@ -223,7 +223,7 @@ enum osmo_cc_ie_type {
|
||||||
#define OSMO_CC_DTMF_MODE_ON 1 /* start tone */
|
#define OSMO_CC_DTMF_MODE_ON 1 /* start tone */
|
||||||
#define OSMO_CC_DTMF_MODE_DIGITS 2 /* play tone(s) with duration and pauses */
|
#define OSMO_CC_DTMF_MODE_DIGITS 2 /* play tone(s) with duration and pauses */
|
||||||
|
|
||||||
#define OSMO_CC_SOCKET_CAUSE_VERSION_MISMATCH 1 /* version missmatch */
|
#define OSMO_CC_SOCKET_CAUSE_VERSION_MISMATCH 1 /* version mismatch */
|
||||||
#define OSMO_CC_SOCKET_CAUSE_FAILED 2 /* connection failed */
|
#define OSMO_CC_SOCKET_CAUSE_FAILED 2 /* connection failed */
|
||||||
#define OSMO_CC_SOCKET_CAUSE_BROKEN_PIPE 3 /* connected socket failed */
|
#define OSMO_CC_SOCKET_CAUSE_BROKEN_PIPE 3 /* connected socket failed */
|
||||||
#define OSMO_CC_SOCKET_CAUSE_TIMEOUT 4 /* keepalive packets timeout */
|
#define OSMO_CC_SOCKET_CAUSE_TIMEOUT 4 /* keepalive packets timeout */
|
||||||
|
|
|
@ -141,7 +141,7 @@ char *osmo_cc_session_gensdp(osmo_cc_session_t *session)
|
||||||
return sdp;
|
return sdp;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* seperate a word from string that is delimited with one or more space characters */
|
/* separate a word from string that is delimited with one or more space characters */
|
||||||
static char *wordsep(char **text_p)
|
static char *wordsep(char **text_p)
|
||||||
{
|
{
|
||||||
char *text = *text_p;
|
char *text = *text_p;
|
||||||
|
|
|
@ -470,7 +470,7 @@ static int osmo_cc_session_negotiate(osmo_cc_session_t *session_local, struct os
|
||||||
|
|
||||||
PDEBUG(DCC, DEBUG_DEBUG, "Negotiating session.\n");
|
PDEBUG(DCC, DEBUG_DEBUG, "Negotiating session.\n");
|
||||||
|
|
||||||
/* copy remote session infromation */
|
/* copy remote session information */
|
||||||
session_local->origin_remote.username = strdup(session_remote->origin_remote.username);
|
session_local->origin_remote.username = strdup(session_remote->origin_remote.username);
|
||||||
session_local->origin_remote.sess_id = strdup(session_remote->origin_remote.sess_id);
|
session_local->origin_remote.sess_id = strdup(session_remote->origin_remote.sess_id);
|
||||||
session_local->origin_remote.sess_version = strdup(session_remote->origin_remote.sess_version);
|
session_local->origin_remote.sess_version = strdup(session_remote->origin_remote.sess_version);
|
||||||
|
|
|
@ -442,7 +442,7 @@ static int transmit_conn(osmo_cc_conn_t *conn)
|
||||||
|
|
||||||
/* start TX keepalive timeer, if not already
|
/* start TX keepalive timeer, if not already
|
||||||
* because we stop at every message above, we actually restart the timer here.
|
* because we stop at every message above, we actually restart the timer here.
|
||||||
* only if there is no message for the amout of time, the timer fires.
|
* only if there is no message for the amount of time, the timer fires.
|
||||||
*/
|
*/
|
||||||
if (!timer_running(&conn->tx_keepalive_timer))
|
if (!timer_running(&conn->tx_keepalive_timer))
|
||||||
timer_start(&conn->tx_keepalive_timer, OSMO_CC_SOCKET_TX_KEEPALIVE);
|
timer_start(&conn->tx_keepalive_timer, OSMO_CC_SOCKET_TX_KEEPALIVE);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define OSMO_CC_SOCKET_H
|
#define OSMO_CC_SOCKET_H
|
||||||
|
|
||||||
#define OSMO_CC_DEFAULT_PORT 4200
|
#define OSMO_CC_DEFAULT_PORT 4200
|
||||||
#define OSMO_CC_DEFAULT_PORT_MAX 4299
|
#define OSMO_CC_DEFAULT_PORT_MAX 4219
|
||||||
|
|
||||||
#define OSMO_CC_SOCKET_TX_KEEPALIVE 10.0
|
#define OSMO_CC_SOCKET_TX_KEEPALIVE 10.0
|
||||||
#define OSMO_CC_SOCKET_RX_KEEPALIVE 20.0
|
#define OSMO_CC_SOCKET_RX_KEEPALIVE 20.0
|
||||||
|
|
Loading…
Reference in New Issue