2006-12-21 06:30:28 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the Sofia-SIP package
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005 Nokia Corporation.
|
|
|
|
*
|
|
|
|
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2.1 of
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**@CFILE test_soa.c
|
|
|
|
* @brief High-level tester for Sofia SDP Offer/Answer Engine
|
|
|
|
*
|
|
|
|
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* @date Created: Wed Aug 17 12:12:12 EEST 2005 ppessi
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#if HAVE_ALARM
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
struct context;
|
|
|
|
#define SOA_MAGIC_T struct context
|
|
|
|
|
|
|
|
#include "sofia-sip/soa.h"
|
|
|
|
#include "sofia-sip/soa_tag.h"
|
|
|
|
#include "sofia-sip/soa_add.h"
|
|
|
|
|
|
|
|
#include <sofia-sip/sdp.h>
|
|
|
|
|
|
|
|
#include <sofia-sip/su_log.h>
|
|
|
|
#include <sofia-sip/sip_tag.h>
|
|
|
|
|
|
|
|
extern su_log_t soa_log[];
|
|
|
|
|
|
|
|
char const name[] = "test_soa";
|
|
|
|
int tstflags = 0;
|
|
|
|
#define TSTFLAGS tstflags
|
|
|
|
|
|
|
|
#include <sofia-sip/tstdef.h>
|
|
|
|
|
|
|
|
#if HAVE_FUNC
|
|
|
|
#elif HAVE_FUNCTION
|
|
|
|
#define __func__ __FUNCTION__
|
|
|
|
#else
|
|
|
|
#define __func__ name
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define NONE ((void*)-1)
|
|
|
|
|
|
|
|
struct context
|
|
|
|
{
|
|
|
|
su_home_t home[1];
|
|
|
|
su_root_t *root;
|
|
|
|
|
|
|
|
struct {
|
|
|
|
soa_session_t *a;
|
|
|
|
soa_session_t *b;
|
|
|
|
} asynch;
|
|
|
|
|
|
|
|
soa_session_t *a;
|
|
|
|
soa_session_t *b;
|
|
|
|
|
|
|
|
soa_session_t *completed;
|
|
|
|
};
|
|
|
|
|
|
|
|
int test_api_completed(struct context *arg, soa_session_t *session)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_api_errors(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
|
|
|
|
char const *phrase = NULL;
|
|
|
|
char const *null = NULL;
|
|
|
|
|
|
|
|
TEST_1(!soa_create("default", NULL, NULL));
|
|
|
|
TEST_1(!soa_clone(NULL, NULL, NULL));
|
|
|
|
TEST_VOID(soa_destroy(NULL));
|
|
|
|
|
|
|
|
TEST_1(-1 == soa_set_params(NULL, TAG_END()));
|
|
|
|
TEST_1(-1 == soa_get_params(NULL, TAG_END()));
|
|
|
|
|
|
|
|
TEST_1(!soa_get_paramlist(NULL, TAG_END()));
|
|
|
|
|
|
|
|
TEST(soa_error_as_sip_response(NULL, &phrase), 500);
|
|
|
|
TEST_S(phrase, "Internal Server Error");
|
|
|
|
|
|
|
|
TEST_1(soa_error_as_sip_reason(NULL));
|
|
|
|
|
|
|
|
TEST_1(!soa_media_features(NULL, 0, NULL));
|
|
|
|
|
|
|
|
TEST_1(!soa_sip_require(NULL));
|
|
|
|
TEST_1(!soa_sip_supported(NULL));
|
|
|
|
|
|
|
|
TEST_1(-1 == soa_remote_sip_features(NULL, &null, &null));
|
|
|
|
|
|
|
|
TEST_1(soa_set_capability_sdp(NULL, NULL, NULL, -1) < 0);
|
|
|
|
TEST_1(soa_set_remote_sdp(NULL, NULL, NULL, -1) < 0);
|
|
|
|
TEST_1(soa_set_user_sdp(NULL, NULL, NULL, -1) < 0);
|
|
|
|
|
|
|
|
TEST_1(soa_get_capability_sdp(NULL, NULL, NULL, NULL) < 0);
|
|
|
|
TEST_1(soa_get_remote_sdp(NULL, NULL, NULL, NULL) < 0);
|
|
|
|
TEST_1(soa_get_user_sdp(NULL, NULL, NULL, NULL) < 0);
|
|
|
|
TEST_1(soa_get_local_sdp(NULL, NULL, NULL, NULL) < 0);
|
|
|
|
|
|
|
|
TEST_1(-1 == soa_generate_offer(NULL, 0, test_api_completed));
|
|
|
|
|
|
|
|
TEST_1(-1 == soa_generate_answer(NULL, test_api_completed));
|
|
|
|
|
|
|
|
TEST_1(-1 == soa_process_answer(NULL, test_api_completed));
|
|
|
|
|
|
|
|
TEST_1(-1 == soa_process_reject(NULL, test_api_completed));
|
|
|
|
|
|
|
|
TEST(soa_activate(NULL, "both"), -1);
|
|
|
|
TEST(soa_deactivate(NULL, "both"), -1);
|
|
|
|
TEST_VOID(soa_terminate(NULL, "both"));
|
|
|
|
|
|
|
|
TEST_1(!soa_is_complete(NULL));
|
|
|
|
|
|
|
|
TEST_1(!soa_init_offer_answer(NULL));
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(NULL), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_video_active(NULL), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_image_active(NULL), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_chat_active(NULL), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
TEST(soa_is_remote_audio_active(NULL), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_video_active(NULL), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_image_active(NULL), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_chat_active(NULL), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_soa_tags(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
|
|
|
|
su_home_t home[1] = { SU_HOME_INIT(home) };
|
|
|
|
tagi_t *t;
|
|
|
|
|
|
|
|
tagi_t const soafilter[] = {
|
|
|
|
{ TAG_FILTER(soa_tag_filter) },
|
|
|
|
{ TAG_NULL() }
|
|
|
|
};
|
|
|
|
|
|
|
|
t = tl_filtered_tlist(home, soafilter,
|
|
|
|
SIPTAG_FROM_STR("sip:my.domain"),
|
|
|
|
SOATAG_USER_SDP_STR("v=0"),
|
|
|
|
SOATAG_HOLD("*"),
|
|
|
|
TAG_END());
|
|
|
|
TEST_1(t);
|
|
|
|
TEST_P(t[0].t_tag, soatag_user_sdp_str);
|
|
|
|
TEST_P(t[1].t_tag, soatag_hold);
|
|
|
|
TEST_1(t[2].t_tag == NULL || t[2].t_tag == tag_null);
|
|
|
|
|
|
|
|
su_home_deinit(home);
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_init(struct context *ctx, char *argv[])
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
ctx->root = su_root_create(ctx); TEST_1(ctx->root);
|
|
|
|
|
|
|
|
ctx->asynch.a = soa_create("asynch", ctx->root, ctx);
|
|
|
|
TEST_1(!ctx->asynch.a);
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
TEST_1(!soa_find("asynch"));
|
|
|
|
TEST_1(soa_find("default"));
|
|
|
|
|
|
|
|
n = soa_add("asynch", &soa_asynch_actions); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_find("asynch"));
|
|
|
|
|
|
|
|
ctx->asynch.a = soa_create("asynch", ctx->root, ctx);
|
|
|
|
TEST_1(ctx->asynch.a);
|
|
|
|
|
|
|
|
ctx->asynch.b = soa_create("asynch", ctx->root, ctx);
|
|
|
|
TEST_1(ctx->asynch.b);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Create asynchronous endpoints */
|
|
|
|
|
|
|
|
ctx->a = soa_create("static", ctx->root, ctx);
|
|
|
|
TEST_1(!ctx->a);
|
|
|
|
|
|
|
|
TEST_1(!soa_find("static"));
|
|
|
|
TEST_1(soa_find("default"));
|
|
|
|
|
|
|
|
n = soa_add("static", &soa_default_actions); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_find("static"));
|
|
|
|
|
|
|
|
ctx->a = soa_create("static", ctx->root, ctx);
|
|
|
|
TEST_1(ctx->a);
|
|
|
|
|
|
|
|
ctx->b = soa_create("static", ctx->root, ctx);
|
|
|
|
TEST_1(ctx->b);
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_params(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
int n;
|
|
|
|
int af;
|
|
|
|
char const *address;
|
|
|
|
char const *hold;
|
|
|
|
int rtp_select, rtp_sort;
|
|
|
|
int rtp_mismatch;
|
|
|
|
int srtp_enable, srtp_confidentiality, srtp_integrity;
|
|
|
|
soa_session_t *a = ctx->a, *b = ctx->b;
|
|
|
|
|
|
|
|
n = soa_set_params(a, TAG_END()); TEST(n, 0);
|
|
|
|
n = soa_set_params(b, TAG_END()); TEST(n, 0);
|
|
|
|
|
|
|
|
af = -42;
|
|
|
|
address = NONE;
|
|
|
|
hold = NONE;
|
|
|
|
|
|
|
|
rtp_select = -1, rtp_sort = -1, rtp_mismatch = -1;
|
|
|
|
srtp_enable = -1, srtp_confidentiality = -1, srtp_integrity = -1;
|
|
|
|
|
|
|
|
TEST(soa_get_params(a,
|
|
|
|
SOATAG_AF_REF(af),
|
|
|
|
SOATAG_ADDRESS_REF(address),
|
|
|
|
SOATAG_HOLD_REF(hold),
|
|
|
|
|
|
|
|
SOATAG_RTP_SELECT_REF(rtp_select),
|
|
|
|
SOATAG_RTP_SORT_REF(rtp_sort),
|
|
|
|
SOATAG_RTP_MISMATCH_REF(rtp_mismatch),
|
|
|
|
|
|
|
|
SOATAG_SRTP_ENABLE_REF(srtp_enable),
|
|
|
|
SOATAG_SRTP_CONFIDENTIALITY_REF(srtp_confidentiality),
|
|
|
|
SOATAG_SRTP_INTEGRITY_REF(srtp_integrity),
|
|
|
|
TAG_END()),
|
|
|
|
9);
|
|
|
|
TEST(af, SOA_AF_ANY);
|
|
|
|
TEST_P(address, 0);
|
|
|
|
TEST_P(hold, 0);
|
|
|
|
TEST(rtp_select, SOA_RTP_SELECT_SINGLE);
|
|
|
|
TEST(rtp_sort, SOA_RTP_SORT_DEFAULT);
|
|
|
|
TEST(rtp_mismatch, 0);
|
|
|
|
TEST(srtp_enable, 0);
|
|
|
|
TEST(srtp_confidentiality, 0);
|
|
|
|
TEST(srtp_integrity, 0);
|
|
|
|
|
|
|
|
TEST(soa_set_params(a,
|
|
|
|
SOATAG_AF(SOA_AF_IP4_IP6),
|
|
|
|
SOATAG_ADDRESS("127.0.0.1"),
|
|
|
|
SOATAG_HOLD("audio"),
|
|
|
|
|
|
|
|
SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL),
|
|
|
|
SOATAG_RTP_SORT(SOA_RTP_SORT_LOCAL),
|
|
|
|
SOATAG_RTP_MISMATCH(1),
|
|
|
|
|
|
|
|
SOATAG_SRTP_ENABLE(1),
|
|
|
|
SOATAG_SRTP_CONFIDENTIALITY(1),
|
|
|
|
SOATAG_SRTP_INTEGRITY(1),
|
|
|
|
|
|
|
|
TAG_END()),
|
|
|
|
9);
|
|
|
|
TEST(soa_get_params(a,
|
|
|
|
SOATAG_AF_REF(af),
|
|
|
|
SOATAG_ADDRESS_REF(address),
|
|
|
|
SOATAG_HOLD_REF(hold),
|
|
|
|
|
|
|
|
SOATAG_RTP_SELECT_REF(rtp_select),
|
|
|
|
SOATAG_RTP_SORT_REF(rtp_sort),
|
|
|
|
SOATAG_RTP_MISMATCH_REF(rtp_mismatch),
|
|
|
|
|
|
|
|
SOATAG_SRTP_ENABLE_REF(srtp_enable),
|
|
|
|
SOATAG_SRTP_CONFIDENTIALITY_REF(srtp_confidentiality),
|
|
|
|
SOATAG_SRTP_INTEGRITY_REF(srtp_integrity),
|
|
|
|
TAG_END()),
|
|
|
|
9);
|
|
|
|
TEST(af, SOA_AF_IP4_IP6);
|
|
|
|
TEST_S(address, "127.0.0.1");
|
|
|
|
TEST_S(hold, "audio");
|
|
|
|
TEST(rtp_select, SOA_RTP_SELECT_ALL);
|
|
|
|
TEST(rtp_sort, SOA_RTP_SORT_LOCAL);
|
|
|
|
TEST(rtp_mismatch, 1);
|
|
|
|
TEST(srtp_enable, 1);
|
|
|
|
TEST(srtp_confidentiality, 1);
|
|
|
|
TEST(srtp_integrity, 1);
|
|
|
|
|
|
|
|
/* Restore defaults */
|
|
|
|
TEST(soa_set_params(a,
|
|
|
|
SOATAG_AF(SOA_AF_IP4_IP6),
|
|
|
|
SOATAG_ADDRESS(NULL),
|
|
|
|
SOATAG_HOLD(NULL),
|
|
|
|
|
|
|
|
SOATAG_RTP_SELECT(SOA_RTP_SELECT_SINGLE),
|
|
|
|
SOATAG_RTP_SORT(SOA_RTP_SORT_DEFAULT),
|
|
|
|
SOATAG_RTP_MISMATCH(0),
|
|
|
|
|
|
|
|
SOATAG_SRTP_ENABLE(0),
|
|
|
|
SOATAG_SRTP_CONFIDENTIALITY(0),
|
|
|
|
SOATAG_SRTP_INTEGRITY(0),
|
|
|
|
|
|
|
|
TAG_END()),
|
|
|
|
9);
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_completed(struct context *ctx, soa_session_t *session)
|
|
|
|
{
|
|
|
|
ctx->completed = session;
|
|
|
|
su_root_break(ctx->root);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_static_offer_answer(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
int n;
|
|
|
|
|
|
|
|
soa_session_t *a, *b;
|
|
|
|
|
|
|
|
char const *caps = NONE, *offer = NONE, *answer = NONE;
|
2007-04-15 02:03:41 +00:00
|
|
|
isize_t capslen = (isize_t)-1;
|
|
|
|
isize_t offerlen = (isize_t)-1;
|
|
|
|
isize_t answerlen = (isize_t)-1;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
su_home_t home[1] = { SU_HOME_INIT(home) };
|
|
|
|
|
|
|
|
char const a_caps[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 0 RTP/AVP 0 8\r\n";
|
|
|
|
|
|
|
|
char const b_caps[] =
|
|
|
|
"m=audio 5004 RTP/AVP 96 8\n"
|
|
|
|
"m=rtpmap:96 GSM/8000\n";
|
|
|
|
|
|
|
|
TEST(soa_set_capability_sdp(ctx->a, 0, "m=audio 0 RTP/AVP 0 8", -1),
|
|
|
|
1);
|
|
|
|
TEST(soa_set_capability_sdp(ctx->a, 0, a_caps, strlen(a_caps)),
|
|
|
|
1);
|
|
|
|
TEST(soa_get_capability_sdp(ctx->a, NULL, &caps, &capslen), 1);
|
|
|
|
|
|
|
|
TEST_1(caps != NULL && caps != NONE);
|
|
|
|
TEST_1(capslen > 0);
|
|
|
|
|
|
|
|
TEST(soa_set_user_sdp(ctx->b, 0, b_caps, strlen(b_caps)), 1);
|
|
|
|
TEST(soa_get_capability_sdp(ctx->a, NULL, &caps, &capslen), 1);
|
|
|
|
|
|
|
|
TEST_1(a = soa_clone(ctx->a, ctx->root, ctx));
|
|
|
|
TEST_1(b = soa_clone(ctx->b, ctx->root, ctx));
|
|
|
|
|
|
|
|
n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 0);
|
|
|
|
|
|
|
|
n = soa_set_user_sdp(a, 0, "m=audio 5004 RTP/AVP 0 8", -1); TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 0);
|
|
|
|
|
|
|
|
n = soa_set_params(b,
|
|
|
|
SOATAG_LOCAL_SDP_STR("m=audio 5004 RTP/AVP 8"),
|
|
|
|
SOATAG_AF(SOA_AF_IP4_ONLY),
|
|
|
|
SOATAG_ADDRESS("1.2.3.4"),
|
|
|
|
TAG_END());
|
|
|
|
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
TEST_1(strstr(answer, "c=IN IP4 1.2.3.4"));
|
|
|
|
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_video_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_image_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_chat_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_video_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_image_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_chat_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
/* 'A' will put call on hold */
|
|
|
|
offer = NONE;
|
|
|
|
TEST(soa_set_params(a, SOATAG_HOLD("*"), TAG_END()), 1);
|
|
|
|
|
|
|
|
TEST(soa_generate_offer(a, 1, test_completed), 0);
|
|
|
|
TEST(soa_get_local_sdp(a, NULL, &offer, &offerlen), 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(strstr(offer, "a=sendonly"));
|
|
|
|
TEST(soa_set_remote_sdp(b, 0, offer, offerlen), 1);
|
|
|
|
TEST(soa_generate_answer(b, test_completed), 0);
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
TEST_1(strstr(answer, "a=recvonly"));
|
|
|
|
TEST(soa_set_remote_sdp(a, 0, answer, -1), 1);
|
|
|
|
TEST(soa_process_answer(a, test_completed), 0);
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDONLY);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDONLY);
|
|
|
|
|
2008-01-26 19:48:14 +00:00
|
|
|
/* 'A' will put call inactive */
|
|
|
|
offer = NONE;
|
|
|
|
TEST(soa_set_params(a, SOATAG_HOLD("#"), TAG_END()), 1);
|
|
|
|
|
|
|
|
TEST(soa_generate_offer(a, 1, test_completed), 0);
|
|
|
|
TEST(soa_get_local_sdp(a, NULL, &offer, &offerlen), 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(strstr(offer, "a=inactive"));
|
|
|
|
TEST(soa_set_remote_sdp(b, 0, offer, offerlen), 1);
|
|
|
|
TEST(soa_generate_answer(b, test_completed), 0);
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
TEST_1(strstr(answer, "a=inactive"));
|
|
|
|
TEST(soa_set_remote_sdp(a, 0, answer, -1), 1);
|
|
|
|
TEST(soa_process_answer(a, test_completed), 0);
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_INACTIVE);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_INACTIVE);
|
|
|
|
|
|
|
|
/* B will send an offer to A, but there is no change in O/A status */
|
|
|
|
TEST(soa_generate_offer(b, 1, test_completed), 0);
|
|
|
|
TEST(soa_get_local_sdp(b, NULL, &offer, &offerlen), 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(!strstr(offer, "a=inactive"));
|
2008-03-05 21:12:12 +00:00
|
|
|
/* printf("offer:\n%s", offer); */
|
2008-01-26 19:48:14 +00:00
|
|
|
TEST(soa_set_remote_sdp(a, 0, offer, offerlen), 1);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_generate_answer(a, test_completed), 0);
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_INACTIVE);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_INACTIVE);
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
TEST(soa_get_local_sdp(a, NULL, &answer, &answerlen), 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
TEST_1(strstr(answer, "a=inactive"));
|
2008-03-05 21:12:12 +00:00
|
|
|
/* printf("answer:\n%s", answer); */
|
2008-01-26 19:48:14 +00:00
|
|
|
TEST(soa_set_remote_sdp(b, 0, answer, -1), 1);
|
|
|
|
TEST(soa_process_answer(b, test_completed), 0);
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(b), SOA_ACTIVE_INACTIVE);
|
|
|
|
TEST(soa_is_remote_audio_active(b), SOA_ACTIVE_INACTIVE);
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
/* 'A' will release hold. */
|
|
|
|
TEST(soa_set_params(a, SOATAG_HOLD(NULL), TAG_END()), 1);
|
|
|
|
|
|
|
|
TEST(soa_generate_offer(a, 1, test_completed), 0);
|
|
|
|
TEST(soa_get_local_sdp(a, NULL, &offer, &offerlen), 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
2008-01-26 19:48:14 +00:00
|
|
|
TEST_1(!strstr(offer, "a=sendonly") && !strstr(offer, "a=inactive"));
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST(soa_set_remote_sdp(b, 0, offer, offerlen), 1);
|
|
|
|
TEST(soa_generate_answer(b, test_completed), 0);
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
2008-01-26 19:48:14 +00:00
|
|
|
TEST_1(!strstr(answer, "a=recvonly") && !strstr(answer, "a=inactive"));
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST(soa_set_remote_sdp(a, 0, answer, -1), 1);
|
|
|
|
TEST(soa_process_answer(a, test_completed), 0);
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
/* 'A' will put B on hold but this time with c=IN IP4 0.0.0.0 */
|
|
|
|
TEST(soa_set_params(a, SOATAG_HOLD("*"), TAG_END()), 1);
|
|
|
|
TEST(soa_generate_offer(a, 1, test_completed), 0);
|
|
|
|
|
|
|
|
{
|
|
|
|
sdp_session_t const *o_sdp;
|
|
|
|
sdp_session_t *sdp;
|
|
|
|
sdp_printer_t *p;
|
|
|
|
sdp_connection_t *c;
|
|
|
|
|
|
|
|
TEST(soa_get_local_sdp(a, &o_sdp, NULL, NULL), 1);
|
|
|
|
TEST_1(o_sdp != NULL && o_sdp != NONE);
|
|
|
|
TEST_1(sdp = sdp_session_dup(home, o_sdp));
|
|
|
|
|
|
|
|
/* Remove mode, change c=, encode offer */
|
|
|
|
if (sdp->sdp_media->m_connections)
|
|
|
|
c = sdp->sdp_media->m_connections;
|
|
|
|
else
|
|
|
|
c = sdp->sdp_connection;
|
|
|
|
TEST_1(c);
|
|
|
|
c->c_address = "0.0.0.0";
|
|
|
|
|
|
|
|
TEST_1(p = sdp_print(home, sdp, NULL, 0, sdp_f_realloc));
|
|
|
|
TEST_1(sdp_message(p));
|
|
|
|
offer = sdp_message(p); offerlen = strlen(offer);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(soa_set_remote_sdp(b, 0, offer, -1), 1);
|
|
|
|
TEST(soa_generate_answer(b, test_completed), 0);
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
TEST_1(strstr(answer, "a=recvonly"));
|
|
|
|
TEST(soa_set_remote_sdp(a, 0, answer, -1), 1);
|
|
|
|
TEST(soa_process_answer(a, test_completed), 0);
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDONLY);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDONLY);
|
|
|
|
TEST(soa_is_audio_active(b), SOA_ACTIVE_RECVONLY);
|
|
|
|
TEST(soa_is_remote_audio_active(b), SOA_ACTIVE_RECVONLY);
|
|
|
|
|
|
|
|
/* 'A' will propose adding video. */
|
|
|
|
/* 'B' will reject. */
|
|
|
|
TEST(soa_set_params(a,
|
|
|
|
SOATAG_HOLD(NULL), /* 'A' will release hold. */
|
Update sofia-sip from darcs:
Mon May 14 12:43:07 EDT 2007 martti.mela@nokia.com
* su_base_port.c: fixed a double free in su_base_port_start_shared().
Fri May 25 13:56:23 EDT 2007 Pekka.Pessi@nokia.com
* soa: added SOATAG_ORDERED_USER(), SOATAG_REUSE_REJECTED().
Allow replacing existing m=lines.
Sun May 27 14:52:13 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.c: fixed bug #1726034
Mon May 28 04:57:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nth.c: using non-blocking connect in test program, too.
Mon May 28 04:58:05 EDT 2007 Pekka.Pessi@nokia.com
* su.c: making all sockets non-blocking by default.
Mon May 28 04:59:28 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su.m4: moved contents into sac-s2.m4
Mon May 28 05:32:26 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed May 30 10:37:53 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su2.m4: added configure option --disable-tag-cast.
Added SU_INLINE_TAG_CAST into sofia-sip/su_configure.h{,.in}.
Using SU_INLINE_TAG_CAST in
sofia-sip/sip_tag.h{,.in}
sofia-sip/http_tag.h{,.in}
sofia-sip/su_tag.h
sofia-sip/su_tag_io.h
sofia-sip/auth_module.h
sofia-sip/nth_tag.h
sofia-sip/nua_tag.h
Fri Jun 1 15:11:52 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed tport_set_params() with secondary transports
Fri Jun 1 15:13:23 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_tcp.c: checking for end-of-stream even if su_getmsgsize() promised more data
Fri Jun 1 15:15:34 EDT 2007 Pekka.Pessi@nokia.com
* tport: added tport_is_clear_to_send(), allow use of tport_pending() without msg
The error callback from tport can now be registered even if there is no
request pending on transport (e.g., when keeping a transport connection open
for inbound messages).
Fri Jun 1 15:16:43 EDT 2007 Pekka.Pessi@nokia.com
* nta: not retrying after an transport error if application provided the transport
Fri Jun 1 15:17:23 EDT 2007 Pekka.Pessi@nokia.com
* sip: do not accept empty URIs (<>) in From, To, and other headers expecting name-addr format
Fri Jun 1 15:17:43 EDT 2007 Pekka.Pessi@nokia.com
* torture_url.c: added test for parsing empty URLs.
Fri Jun 1 15:19:27 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.[hc]: use registered connections for outbound with TCP.
Added test_proxy_close_tports() used testing recovering from TCP failures.
Fri Jun 1 15:20:33 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: added --print-tags and --tags-a, --tags=b and --tags=c options
Added more functions for handling events
Fri Jun 1 15:22:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed some tests depending on delivery of responses in correct order
Reordering might happen if some messages are sent over TCP, other over UDP.
Fri Jun 1 15:27:55 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: re-registering in case the TCP connection towards proxy is closed
In test_nua, Mr. B is now using TCP with the test proxy.
Fri Jun 1 15:35:39 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_refer.c: fixed SIP payload checks
Fri Jun 1 15:36:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_internal.h: added orq_user_tport field
Tue Jun 5 06:16:43 EDT 2007 Pekka.Pessi@nokia.com
* hide_email.sh: now fixing links, too.
Fri Jun 15 05:34:29 EDT 2007 Pekka.Pessi@nokia.com
* nua: fixed documentation entries for API functions left out from doxygen
Thanks for Jerry Ricahrds for pointing this out.
Wed May 23 10:26:26 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Correct documentation for parameter type of NUTAG_WITH_SAVED
Mon Jun 18 12:34:58 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Make nua_saved_event_request() and hence NUTAG_WITH_SAVED resilient to a NULL event content
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5413 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-06-20 10:41:15 +00:00
|
|
|
SOATAG_USER_SDP_STR("m=audio 5008 RTP/AVP 0 8\r\ni=x\r\n"
|
2006-12-21 06:30:28 +00:00
|
|
|
"m=video 5006 RTP/AVP 34\r\n"),
|
|
|
|
TAG_END()), 2);
|
|
|
|
|
|
|
|
TEST(soa_generate_offer(a, 1, test_completed), 0);
|
|
|
|
TEST(soa_get_local_sdp(a, NULL, &offer, &offerlen), 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(!strstr(offer, "a=sendonly"));
|
|
|
|
TEST_1(strstr(offer, "m=video"));
|
|
|
|
TEST(soa_set_remote_sdp(b, 0, offer, offerlen), 1);
|
|
|
|
TEST(soa_generate_answer(b, test_completed), 0);
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
TEST_1(!strstr(answer, "a=recvonly"));
|
|
|
|
TEST_1(strstr(answer, "m=video"));
|
|
|
|
TEST(soa_set_remote_sdp(a, 0, answer, -1), 1);
|
|
|
|
TEST(soa_process_answer(a, test_completed), 0);
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_video_active(a), SOA_ACTIVE_REJECTED);
|
|
|
|
|
|
|
|
{
|
|
|
|
/* Test tags */
|
|
|
|
sdp_session_t const *l = NULL, *u = NULL, *r = NULL;
|
|
|
|
sdp_media_t const *m;
|
|
|
|
|
|
|
|
TEST(soa_get_params(b,
|
|
|
|
SOATAG_LOCAL_SDP_REF(l),
|
|
|
|
SOATAG_USER_SDP_REF(u),
|
|
|
|
SOATAG_REMOTE_SDP_REF(r),
|
|
|
|
TAG_END()), 3);
|
|
|
|
|
|
|
|
TEST_1(l); TEST_1(u); TEST_1(r);
|
|
|
|
TEST_1(m = l->sdp_media); TEST(m->m_type, sdp_media_audio);
|
|
|
|
TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST(m->m_type, sdp_media_video);
|
|
|
|
TEST_1(m->m_rejected);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 'B' will now propose adding video. */
|
|
|
|
/* 'A' will accept. */
|
|
|
|
TEST(soa_set_params(b,
|
|
|
|
SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8\r\n"
|
|
|
|
"m=video 5006 RTP/AVP 34\r\n"),
|
|
|
|
TAG_END()), 1);
|
|
|
|
|
|
|
|
TEST(soa_generate_offer(b, 1, test_completed), 0);
|
|
|
|
TEST(soa_get_local_sdp(b, NULL, &offer, &offerlen), 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(!strstr(offer, "b=sendonly"));
|
|
|
|
TEST_1(strstr(offer, "m=video"));
|
|
|
|
TEST(soa_set_remote_sdp(a, 0, offer, offerlen), 1);
|
|
|
|
TEST(soa_generate_answer(a, test_completed), 0);
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
TEST(soa_get_local_sdp(a, NULL, &answer, &answerlen), 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
TEST_1(!strstr(answer, "b=recvonly"));
|
|
|
|
TEST_1(strstr(answer, "m=video"));
|
|
|
|
TEST(soa_set_remote_sdp(b, 0, answer, -1), 1);
|
|
|
|
TEST(soa_process_answer(b, test_completed), 0);
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_video_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
TEST_VOID(soa_terminate(a, NULL));
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
TEST_VOID(soa_terminate(b, NULL));
|
|
|
|
|
|
|
|
TEST_VOID(soa_destroy(a));
|
|
|
|
TEST_VOID(soa_destroy(b));
|
|
|
|
|
|
|
|
su_home_deinit(home);
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_codec_selection(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
int n;
|
|
|
|
|
|
|
|
soa_session_t *a, *b;
|
|
|
|
|
|
|
|
char const *offer = NONE, *answer = NONE;
|
2007-04-15 02:03:41 +00:00
|
|
|
isize_t offerlen = (isize_t)-1, answerlen = (isize_t)-1;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
sdp_session_t const *a_sdp, *b_sdp;
|
|
|
|
sdp_media_t const *m;
|
|
|
|
sdp_rtpmap_t const *rm;
|
|
|
|
|
|
|
|
char const a_caps[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8 97\r\n"
|
|
|
|
"a=rtpmap:97 GSM/8000\n"
|
|
|
|
;
|
|
|
|
|
|
|
|
char const b_caps[] =
|
|
|
|
"m=audio 5004 RTP/AVP 96 97\n"
|
|
|
|
"a=rtpmap:96 G7231/8000\n"
|
|
|
|
"a=rtpmap:97 G729/8000\n";
|
|
|
|
|
|
|
|
TEST_1(a = soa_create("static", ctx->root, ctx));
|
|
|
|
TEST_1(b = soa_create("static", ctx->root, ctx));
|
|
|
|
|
|
|
|
TEST(soa_set_user_sdp(a, 0, a_caps, strlen(a_caps)), 1);
|
|
|
|
TEST(soa_set_user_sdp(b, 0, b_caps, strlen(b_caps)), 1);
|
|
|
|
|
|
|
|
TEST(soa_set_params(a, SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()), 1);
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 0);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_REJECTED);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_REJECTED);
|
|
|
|
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 96);
|
|
|
|
TEST_S(rm->rm_encoding, "G7231");
|
Update sofia-sip from darcs:
Mon May 14 12:43:07 EDT 2007 martti.mela@nokia.com
* su_base_port.c: fixed a double free in su_base_port_start_shared().
Fri May 25 13:56:23 EDT 2007 Pekka.Pessi@nokia.com
* soa: added SOATAG_ORDERED_USER(), SOATAG_REUSE_REJECTED().
Allow replacing existing m=lines.
Sun May 27 14:52:13 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.c: fixed bug #1726034
Mon May 28 04:57:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nth.c: using non-blocking connect in test program, too.
Mon May 28 04:58:05 EDT 2007 Pekka.Pessi@nokia.com
* su.c: making all sockets non-blocking by default.
Mon May 28 04:59:28 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su.m4: moved contents into sac-s2.m4
Mon May 28 05:32:26 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed May 30 10:37:53 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su2.m4: added configure option --disable-tag-cast.
Added SU_INLINE_TAG_CAST into sofia-sip/su_configure.h{,.in}.
Using SU_INLINE_TAG_CAST in
sofia-sip/sip_tag.h{,.in}
sofia-sip/http_tag.h{,.in}
sofia-sip/su_tag.h
sofia-sip/su_tag_io.h
sofia-sip/auth_module.h
sofia-sip/nth_tag.h
sofia-sip/nua_tag.h
Fri Jun 1 15:11:52 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed tport_set_params() with secondary transports
Fri Jun 1 15:13:23 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_tcp.c: checking for end-of-stream even if su_getmsgsize() promised more data
Fri Jun 1 15:15:34 EDT 2007 Pekka.Pessi@nokia.com
* tport: added tport_is_clear_to_send(), allow use of tport_pending() without msg
The error callback from tport can now be registered even if there is no
request pending on transport (e.g., when keeping a transport connection open
for inbound messages).
Fri Jun 1 15:16:43 EDT 2007 Pekka.Pessi@nokia.com
* nta: not retrying after an transport error if application provided the transport
Fri Jun 1 15:17:23 EDT 2007 Pekka.Pessi@nokia.com
* sip: do not accept empty URIs (<>) in From, To, and other headers expecting name-addr format
Fri Jun 1 15:17:43 EDT 2007 Pekka.Pessi@nokia.com
* torture_url.c: added test for parsing empty URLs.
Fri Jun 1 15:19:27 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.[hc]: use registered connections for outbound with TCP.
Added test_proxy_close_tports() used testing recovering from TCP failures.
Fri Jun 1 15:20:33 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: added --print-tags and --tags-a, --tags=b and --tags=c options
Added more functions for handling events
Fri Jun 1 15:22:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed some tests depending on delivery of responses in correct order
Reordering might happen if some messages are sent over TCP, other over UDP.
Fri Jun 1 15:27:55 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: re-registering in case the TCP connection towards proxy is closed
In test_nua, Mr. B is now using TCP with the test proxy.
Fri Jun 1 15:35:39 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_refer.c: fixed SIP payload checks
Fri Jun 1 15:36:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_internal.h: added orq_user_tport field
Tue Jun 5 06:16:43 EDT 2007 Pekka.Pessi@nokia.com
* hide_email.sh: now fixing links, too.
Fri Jun 15 05:34:29 EDT 2007 Pekka.Pessi@nokia.com
* nua: fixed documentation entries for API functions left out from doxygen
Thanks for Jerry Ricahrds for pointing this out.
Wed May 23 10:26:26 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Correct documentation for parameter type of NUTAG_WITH_SAVED
Mon Jun 18 12:34:58 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Make nua_saved_event_request() and hence NUTAG_WITH_SAVED resilient to a NULL event content
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5413 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-06-20 10:41:15 +00:00
|
|
|
/* Not reusing payload type 97 from offer */
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 98);
|
|
|
|
TEST_S(rm->rm_encoding, "G729");
|
|
|
|
TEST_1(!rm->rm_next);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
/* Re-O/A: A generates new SDP */
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 0);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
/* Re-O/A: no-one regenerates new SDP */
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 0);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 0);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
/* Re-O/A: accept media without common codecs */
|
|
|
|
|
|
|
|
/* Accept media without common codecs */
|
|
|
|
TEST_1(soa_set_params(a, SOATAG_RTP_MISMATCH(1), TAG_END()));
|
|
|
|
TEST_1(soa_set_params(b, SOATAG_RTP_MISMATCH(1), TAG_END()));
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 96);
|
|
|
|
TEST_S(rm->rm_encoding, "G7231");
|
|
|
|
/* Not using payload type 97 from offer */
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 98);
|
|
|
|
TEST_S(rm->rm_encoding, "G729");
|
|
|
|
TEST_1(!rm->rm_next);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
/* Re-O/A: add a common codec */
|
|
|
|
|
|
|
|
/* Accept media without common codecs */
|
|
|
|
TEST_1(soa_set_params(a, SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8 96 3 127\r\n"
|
|
|
|
"a=rtpmap:96 G729/8000\n"
|
|
|
|
"a=rtpmap:127 CN/8000\n"
|
|
|
|
),
|
|
|
|
SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE),
|
|
|
|
SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL),
|
|
|
|
TAG_END()));
|
|
|
|
TEST_1(soa_set_params(b, SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5004 RTP/AVP 96 3 97 111\r\n"
|
|
|
|
"a=rtpmap:96 G7231/8000\n"
|
|
|
|
"a=rtpmap:97 G729/8000\n"
|
|
|
|
"a=rtpmap:111 telephone-event/8000\n"
|
|
|
|
"a=fmtp:111 0-15\n"
|
|
|
|
),
|
|
|
|
SOATAG_AUDIO_AUX("cn telephone-event"),
|
|
|
|
SOATAG_RTP_SORT(SOA_RTP_SORT_LOCAL),
|
|
|
|
SOATAG_RTP_SELECT(SOA_RTP_SELECT_COMMON),
|
|
|
|
TAG_END()));
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, NULL, NULL); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 3);
|
|
|
|
TEST_S(rm->rm_encoding, "GSM");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 96);
|
|
|
|
TEST_S(rm->rm_encoding, "G729");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 0);
|
|
|
|
TEST_S(rm->rm_encoding, "PCMU");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 8);
|
|
|
|
TEST_S(rm->rm_encoding, "PCMA");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 127);
|
|
|
|
TEST_S(rm->rm_encoding, "CN");
|
|
|
|
TEST_1(!rm->rm_next);
|
|
|
|
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 3);
|
|
|
|
TEST_S(rm->rm_encoding, "GSM");
|
|
|
|
/* Using payload type 96 from offer */
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 96);
|
|
|
|
TEST_S(rm->rm_encoding, "G729");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 111);
|
|
|
|
TEST_S(rm->rm_encoding, "telephone-event");
|
|
|
|
TEST_1(!rm->rm_next);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Re-O/A: prune down to single codec. */
|
|
|
|
|
|
|
|
TEST_1(soa_set_params(a,
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8 97 96 127\r\n"
|
|
|
|
"a=rtpmap:96 G729/8000\n"
|
|
|
|
"a=rtpmap:97 GSM/8000\n"
|
|
|
|
"a=rtpmap:127 CN/8000\n"
|
|
|
|
),
|
|
|
|
SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_RTP_SELECT(SOA_RTP_SELECT_COMMON),
|
|
|
|
TAG_END()));
|
|
|
|
TEST_1(soa_set_params(b,
|
|
|
|
SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_RTP_SORT(SOA_RTP_SORT_LOCAL),
|
|
|
|
SOATAG_RTP_SELECT(SOA_RTP_SELECT_SINGLE),
|
|
|
|
TAG_END()));
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 97);
|
|
|
|
TEST_S(rm->rm_encoding, "GSM");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 127);
|
|
|
|
TEST_S(rm->rm_encoding, "CN");
|
|
|
|
TEST_1(!rm->rm_next);
|
|
|
|
|
|
|
|
/* Answering end matches payload types
|
|
|
|
then sorts by local preference,
|
|
|
|
then select best codec => GSM with pt 97 */
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 97);
|
|
|
|
TEST_S(rm->rm_encoding, "GSM");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 111);
|
|
|
|
TEST_S(rm->rm_encoding, "telephone-event");
|
|
|
|
TEST_1(!rm->rm_next);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Re-O/A: A generates new SDP offer with single codec only */
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 97);
|
|
|
|
TEST_S(rm->rm_encoding, "GSM");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 127);
|
|
|
|
TEST_S(rm->rm_encoding, "CN");
|
|
|
|
TEST_1(!rm->rm_next);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
/* Answer from B is identical to previous one */
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 0);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
/* Add new media - without common codecs */
|
|
|
|
TEST_1(soa_set_params(a,
|
|
|
|
SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8 96 3 127\r\n"
|
|
|
|
"a=rtpmap:96 G729/8000\n"
|
|
|
|
"a=rtpmap:127 CN/8000\n"
|
|
|
|
"m=video 5010 RTP/AVP 31\r\n"
|
|
|
|
"m=audio 6008 RTP/SAVP 3\n"
|
|
|
|
),
|
|
|
|
TAG_END()));
|
|
|
|
TEST_1(soa_set_params(b,
|
|
|
|
SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5004 RTP/AVP 96 3 97 111\r\n"
|
|
|
|
"a=rtpmap:96 G7231/8000\n"
|
|
|
|
"a=rtpmap:97 G729/8000\n"
|
|
|
|
"a=rtpmap:111 telephone-event/8000\n"
|
|
|
|
"a=fmtp:111 0-15\n"
|
|
|
|
"m=audio 6004 RTP/SAVP 96\n"
|
|
|
|
"a=rtpmap:96 G729/8000\n"
|
|
|
|
"m=video 5006 RTP/AVP 34\n"
|
|
|
|
),
|
|
|
|
TAG_END()));
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
/* Answer from B rejects video */
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_video_active(a), SOA_ACTIVE_REJECTED);
|
|
|
|
TEST(soa_is_remote_video_active(a), SOA_ACTIVE_REJECTED);
|
|
|
|
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(m->m_rejected);
|
|
|
|
/* Rejected but tell what we support */
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 34);
|
|
|
|
TEST_S(rm->rm_encoding, "H263");
|
|
|
|
TEST_1(m = m->m_next); TEST_1(m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* A adds H.263 to video */
|
|
|
|
TEST_1(soa_set_params(a,
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8 96 3 127\r\n"
|
|
|
|
"a=rtpmap:96 G729/8000\n"
|
|
|
|
"a=rtpmap:127 CN/8000\n"
|
|
|
|
"m=video 5010 RTP/AVP 31 34\r\n"
|
|
|
|
"m=audio 6008 RTP/SAVP 3\n"
|
|
|
|
),
|
|
|
|
TAG_END()));
|
|
|
|
|
|
|
|
/* B adds GSM to SRTP */
|
|
|
|
TEST_1(soa_set_params(b,
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5004 RTP/AVP 96 3 97 111\r\n"
|
|
|
|
"a=rtpmap:96 G7231/8000\n"
|
|
|
|
"a=rtpmap:97 G729/8000\n"
|
|
|
|
"a=rtpmap:111 telephone-event/8000\n"
|
|
|
|
"a=fmtp:111 0-15\n"
|
|
|
|
"m=audio 6004 RTP/SAVP 96 3\n"
|
|
|
|
"a=rtpmap:96 G729/8000\n"
|
|
|
|
"m=video 5006 RTP/AVP 34\n"
|
|
|
|
),
|
|
|
|
TAG_END()));
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
/* Answer from B now accepts video */
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_video_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_video_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 34);
|
|
|
|
TEST_S(rm->rm_encoding, "H263");
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 34);
|
|
|
|
TEST_S(rm->rm_encoding, "H263");
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* A drops GSM support */
|
|
|
|
|
|
|
|
TEST_1(soa_set_params(a,
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8 96 127\r\n"
|
|
|
|
"a=rtpmap:96 G729/8000\n"
|
|
|
|
"a=rtpmap:127 CN/8000\n"
|
|
|
|
"m=video 5010 RTP/AVP 31 34\r\n"
|
|
|
|
"m=audio 6008 RTP/SAVP 3\n"
|
|
|
|
),
|
|
|
|
TAG_END()));
|
|
|
|
|
|
|
|
/* B adds GSM to SRTP, changes IP address */
|
|
|
|
TEST_1(soa_set_params(b,
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.3\r\n"
|
|
|
|
"m=audio 5004 RTP/AVP 96 3 97 111\r\n"
|
|
|
|
"a=rtpmap:96 G7231/8000\n"
|
|
|
|
"a=rtpmap:97 G729/8000\n"
|
|
|
|
"a=rtpmap:111 telephone-event/8000\n"
|
|
|
|
"a=fmtp:111 0-15\n"
|
|
|
|
"m=audio 6004 RTP/SAVP 96 3\n"
|
|
|
|
"a=rtpmap:96 G729/8000\n"
|
|
|
|
"m=video 5006 RTP/AVP 34\n"
|
|
|
|
),
|
|
|
|
TAG_END()));
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
/* Answer from B now accepts video */
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
/* Check that updated c= line is propagated */
|
|
|
|
TEST_1(b_sdp->sdp_connection);
|
|
|
|
TEST_S(b_sdp->sdp_connection->c_address, "127.0.0.3");
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_video_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_video_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 96);
|
|
|
|
TEST_S(rm->rm_encoding, "G729");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 127);
|
|
|
|
TEST_S(rm->rm_encoding, "CN");
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 34);
|
|
|
|
TEST_S(rm->rm_encoding, "H263");
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 96);
|
|
|
|
TEST_S(rm->rm_encoding, "G729");
|
|
|
|
TEST_1(rm = rm->rm_next); TEST(rm->rm_pt, 111);
|
|
|
|
TEST_S(rm->rm_encoding, "telephone-event");
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(rm = m->m_rtpmaps); TEST(rm->rm_pt, 34);
|
|
|
|
TEST_S(rm->rm_encoding, "H263");
|
|
|
|
TEST_1(m = m->m_next); TEST_1(!m->m_rejected);
|
|
|
|
TEST_1(!m->m_next);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
TEST_VOID(soa_terminate(a, NULL));
|
|
|
|
TEST_VOID(soa_terminate(b, NULL));
|
|
|
|
|
|
|
|
TEST_VOID(soa_destroy(a));
|
|
|
|
TEST_VOID(soa_destroy(b));
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
Update sofia-sip from darcs:
Mon May 14 12:43:07 EDT 2007 martti.mela@nokia.com
* su_base_port.c: fixed a double free in su_base_port_start_shared().
Fri May 25 13:56:23 EDT 2007 Pekka.Pessi@nokia.com
* soa: added SOATAG_ORDERED_USER(), SOATAG_REUSE_REJECTED().
Allow replacing existing m=lines.
Sun May 27 14:52:13 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.c: fixed bug #1726034
Mon May 28 04:57:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nth.c: using non-blocking connect in test program, too.
Mon May 28 04:58:05 EDT 2007 Pekka.Pessi@nokia.com
* su.c: making all sockets non-blocking by default.
Mon May 28 04:59:28 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su.m4: moved contents into sac-s2.m4
Mon May 28 05:32:26 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed May 30 10:37:53 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su2.m4: added configure option --disable-tag-cast.
Added SU_INLINE_TAG_CAST into sofia-sip/su_configure.h{,.in}.
Using SU_INLINE_TAG_CAST in
sofia-sip/sip_tag.h{,.in}
sofia-sip/http_tag.h{,.in}
sofia-sip/su_tag.h
sofia-sip/su_tag_io.h
sofia-sip/auth_module.h
sofia-sip/nth_tag.h
sofia-sip/nua_tag.h
Fri Jun 1 15:11:52 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed tport_set_params() with secondary transports
Fri Jun 1 15:13:23 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_tcp.c: checking for end-of-stream even if su_getmsgsize() promised more data
Fri Jun 1 15:15:34 EDT 2007 Pekka.Pessi@nokia.com
* tport: added tport_is_clear_to_send(), allow use of tport_pending() without msg
The error callback from tport can now be registered even if there is no
request pending on transport (e.g., when keeping a transport connection open
for inbound messages).
Fri Jun 1 15:16:43 EDT 2007 Pekka.Pessi@nokia.com
* nta: not retrying after an transport error if application provided the transport
Fri Jun 1 15:17:23 EDT 2007 Pekka.Pessi@nokia.com
* sip: do not accept empty URIs (<>) in From, To, and other headers expecting name-addr format
Fri Jun 1 15:17:43 EDT 2007 Pekka.Pessi@nokia.com
* torture_url.c: added test for parsing empty URLs.
Fri Jun 1 15:19:27 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.[hc]: use registered connections for outbound with TCP.
Added test_proxy_close_tports() used testing recovering from TCP failures.
Fri Jun 1 15:20:33 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: added --print-tags and --tags-a, --tags=b and --tags=c options
Added more functions for handling events
Fri Jun 1 15:22:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed some tests depending on delivery of responses in correct order
Reordering might happen if some messages are sent over TCP, other over UDP.
Fri Jun 1 15:27:55 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: re-registering in case the TCP connection towards proxy is closed
In test_nua, Mr. B is now using TCP with the test proxy.
Fri Jun 1 15:35:39 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_refer.c: fixed SIP payload checks
Fri Jun 1 15:36:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_internal.h: added orq_user_tport field
Tue Jun 5 06:16:43 EDT 2007 Pekka.Pessi@nokia.com
* hide_email.sh: now fixing links, too.
Fri Jun 15 05:34:29 EDT 2007 Pekka.Pessi@nokia.com
* nua: fixed documentation entries for API functions left out from doxygen
Thanks for Jerry Ricahrds for pointing this out.
Wed May 23 10:26:26 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Correct documentation for parameter type of NUTAG_WITH_SAVED
Mon Jun 18 12:34:58 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Make nua_saved_event_request() and hence NUTAG_WITH_SAVED resilient to a NULL event content
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5413 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-06-20 10:41:15 +00:00
|
|
|
int test_media_replace(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
int n;
|
|
|
|
|
|
|
|
soa_session_t *a, *b;
|
|
|
|
|
|
|
|
char const *offer = NONE, *answer = NONE;
|
|
|
|
isize_t offerlen = (isize_t)-1, answerlen = (isize_t)-1;
|
|
|
|
|
|
|
|
sdp_session_t const *a_sdp, *b_sdp;
|
|
|
|
sdp_media_t const *m;
|
|
|
|
|
|
|
|
char const a_caps[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8\r\n"
|
|
|
|
;
|
|
|
|
|
|
|
|
char const b_caps[] =
|
|
|
|
"m=audio 5004 RTP/AVP 0 8\n"
|
|
|
|
"a=rtpmap:96 G7231/8000\n"
|
|
|
|
"a=rtpmap:97 G729/8000\n"
|
|
|
|
"m=image 5556 UDPTL t38\r\n"
|
|
|
|
"a=T38FaxVersion:0\r\n"
|
|
|
|
"a=T38MaxBitRate:9600\r\n"
|
|
|
|
"a=T38FaxFillBitRemoval:0\r\n"
|
|
|
|
"a=T38FaxTranscodingMMR:0\r\n"
|
|
|
|
"a=T38FaxTranscodingJBIG:0\r\n"
|
|
|
|
"a=T38FaxRateManagement:transferredTCF\r\n"
|
|
|
|
"a=T38FaxMaxDatagram:400\r\n";
|
|
|
|
|
|
|
|
TEST_1(a = soa_create("static", ctx->root, ctx));
|
|
|
|
TEST_1(b = soa_create("static", ctx->root, ctx));
|
|
|
|
|
|
|
|
TEST(soa_set_user_sdp(a, 0, a_caps, strlen(a_caps)), 1);
|
|
|
|
TEST(soa_set_user_sdp(b, 0, b_caps, strlen(b_caps)), 1);
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 0);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
/* Re-O/A: replace media stream */
|
|
|
|
|
|
|
|
/* Accept media without common codecs */
|
|
|
|
TEST_1(soa_set_params(a, SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_ORDERED_USER(1),
|
|
|
|
SOATAG_USER_SDP_STR(
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=image 16384 UDPTL t38\r\n"
|
|
|
|
"a=T38FaxVersion:0\r\n"
|
|
|
|
"a=T38MaxBitRate:9600\r\n"
|
|
|
|
"a=T38FaxFillBitRemoval:0\r\n"
|
|
|
|
"a=T38FaxTranscodingMMR:0\r\n"
|
|
|
|
"a=T38FaxTranscodingJBIG:0\r\n"
|
|
|
|
"a=T38FaxRateManagement:transferredTCF\r\n"
|
|
|
|
"a=T38FaxMaxDatagram:400\r\n"
|
|
|
|
),
|
|
|
|
TAG_END()));
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, NULL, NULL); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST(m->m_type, sdp_media_image);
|
|
|
|
TEST(m->m_proto, sdp_proto_udptl);
|
|
|
|
TEST_1(m->m_format);
|
|
|
|
TEST_S(m->m_format->l_text, "t38");
|
|
|
|
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST(m->m_type, sdp_media_image);
|
|
|
|
TEST(m->m_proto, sdp_proto_udptl);
|
|
|
|
TEST_1(m->m_format);
|
|
|
|
TEST_S(m->m_format->l_text, "t38");
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
TEST_VOID(soa_terminate(a, NULL));
|
|
|
|
TEST_VOID(soa_terminate(b, NULL));
|
|
|
|
|
|
|
|
TEST_VOID(soa_destroy(a));
|
|
|
|
TEST_VOID(soa_destroy(b));
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
|
Merge up to the most recent sofia-sip darcs tree. Includes the following patches from darcs:
Tue Aug 21 09:38:59 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_udp.c: checking error while checking that MSG_TRUNC works.
Shall I pull this patch? (1/43) [ynWvpxqadjk], or ? for help: y
Tue Aug 21 10:49:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_params.c: NUTAG_SIPS_URL() now sets the handle target, too.
Problem reported by Jari Tenhunen.
Shall I pull this patch? (2/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 11:22:42 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: do not destroy INVITE transaction if it has been CANCELed
Handle gracefully cases where the INVITE transaction is destroyed
immediately after canceling it. The old behaviour was to left it up to the
application to ACK the final response returned to INVITE.
Thanks for Fabio Margarido for reporting this problem.
Shall I pull this patch? (3/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 13:02:01 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added test with user SDP containing already rejected media
Shall I pull this patch? (4/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (5/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (6/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:00:10 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: disabled nta_msg_ackbye(). Fix for sf.net bug #1750691
Thanks for Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (7/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 06:54:38 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1750691
Shall I pull this patch? (8/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:03:45 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for nua_bye() sending CANCEL
Shall I pull this patch? (9/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 31 12:08:09 EDT 2007 Pekka.Pessi@nokia.com
* url.c: fixed escaping of '/' %2F, ';' %3B and '=' %3D in URL path/params
Thanks for Fabio Margarido for reporting this bug.
Shall I pull this patch? (10/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 3 10:14:55 EDT 2007 Pekka.Pessi@nokia.com
* url.c: do not un-escape %40 in URI parameters.
Do not unescape %2C, %3B, %3D, or %40 in URI parameters, nor
%2C, %2F, %3B, %3D, or %40 in URI path.
The @ sign can be ambiguous in the SIP URL, e.g.,
<sip:test.info;p=value@test.com>
can be parsed in two ways:
1) username contains test.info;param=value and host part has test.com
2) empty username, host part test.info, URI parameter p=value@test.com
Previously Sofia URL parser converted escaped '@' at signs (%40) in the URI
parameters to the unescaped form. The resulting URI could be ambiguous and
sometimes fail the syntax check if there was no '@' sign before the
unescaped one.
Thanks for Jan van den Bosch and Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (11/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 04:59:57 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed indenting, logging
Shall I pull this patch? (12/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 13 12:47:33 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.h, nua/test_proxy.c: added support for multiple domains
Each domain has its own registrar and authentication module.
Shall I pull this patch? (13/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:19:33 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: added timestamp to event logging
Shall I pull this patch? (14/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:20:12 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed timing problems in testing.
Shall I pull this patch? (15/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:04 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: reduce su_root_step() delay to 0.1 seconds
Shall I pull this patch? (16/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:22 EDT 2007 Pekka.Pessi@nokia.com
* test_register.c: fixed timing problem
Shall I pull this patch? (17/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 17:03:46 EDT 2007 Pekka.Pessi@nokia.com
* test_100rel.c: fixed timing problems resulting in events being reordered
Shall I pull this patch? (18/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:40:53 EDT 2007 Pekka.Pessi@nokia.com
* nua (test_init.c, test_register.c): using test_proxy domains
Shall I pull this patch? (19/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 12:12:32 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added cleanup code
Shall I pull this patch? (20/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:35:35 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: increase lifetime of ACK transaction from T4 to T1 x 64
nta.c creates a ACK transaction in order to restransmit ACK requests when
ever a retransmitted 2XX response to INVITE is received. The UAS retransmits
the 2XX responses for 64 x T1 (32 second by default).
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (21/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 10:21:04 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: generating libsofia-sip-ua/docs/Doxyfile.rfc before making manpages
Shall I pull this patch? (22/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:05:33 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING()
Shall I pull this patch? (23/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:09:06 EDT 2007 Pekka.Pessi@nokia.com
* tport: added ping-pong keepalive on TCP. replaced single tick with connection-specific timer
Now detecting closed connections on TLS, too.
Added tests for idle timeout, receive timeout, ping-pong timeout.
Shall I pull this patch? (24/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 6 10:19:32 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: added nta_incoming_received()
Shall I pull this patch? (25/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:29:56 EDT 2007 Pekka.Pessi@nokia.com
* nua_session.c: delay transition to ready when O/A is incomplete
Delay sending ACK and subsequent transition of call to the ready state when
the 200 OK response to the INVITE is received if the SDP Offer/Answer
exchange using UPDATE/PRACK was still incomplete.
Previously, if the O/A using UPDATE or PRACK was incomplete and an 200 OK
was received, the call setup logic regarded this as a fatal error and
terminated the call.
Thanks for Mike Jerris for detecting and reporting this bug.
Shall I pull this patch? (26/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:22:46 EDT 2007 Pekka.Pessi@nokia.com
* test_call_reject.c: testing Retry-After
Shall I pull this patch? (27/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:42:51 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using rudimentary outbound support in B's proxy.
Shall I pull this patch? (28/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:48:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: added some logging to nua_register_connection_closed()
Shall I pull this patch? (29/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:43:57 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using AUTHTAG_MAX_NCOUNT(1) for Mr. C
C is now challenged every time.
Shall I pull this patch? (30/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 11:05:19 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_100rel.c: fixed timing problem re response to PRACK and ACK
Shall I pull this patch? (31/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 06:02:50 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* DIST_SUBDIRS must include everything unconditionally
Shall I pull this patch? (32/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:53:04 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: silenced warnings
Shall I pull this patch? (33/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
* nua: refactored dialog refresh code
Shall I pull this patch? (34/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nua: refactored dialog refresh code
Shall I pull this patch? (35/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:01:25 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc]: renamed functions setting refresh interval
Shall I pull this patch? (36/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:15:03 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc], nua_stack.c: added nua_dialog_repeat_shutdown()
Shall I pull this patch? (37/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:19:20 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.h: renamed nua_remote_t as nua_dialog_peer_info_t
Shall I pull this patch? (38/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:23:04 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack.c: added timer to client request in order to implement Retry-After
Shall I pull this patch? (39/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:33:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: added backpointers to nua_dialog_usage_t and nua_dialog_state_t
Shall I pull this patch? (40/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:56:48 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: abort() in timeout alarm function if -a is given
Shall I pull this patch? (41/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 17:13:18 EDT 2007 Pekka.Pessi@nokia.com
* nua_subnotref.c: include SIPTAG_EVENT() in the nua_i_notify tag list
Shall I pull this patch? (42/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 10 12:27:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: save Contact from target refresh request or response.
Save the Contact header which the application has added to the target
refresh requests or responses and use the saved contact in subsequent target
refresh requests or responses.
Previously the application had no way of specifying the Contact included in
the automatic responses to target refresh requests.
Thanks for Anthony Minessale for reporting this problem.
Shall I pull this patch? (43/43) [ynWvpxqadjk], or ? for help: y
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5692 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-09-10 20:45:25 +00:00
|
|
|
int test_media_reject(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
int n;
|
|
|
|
|
|
|
|
soa_session_t *a, *b;
|
|
|
|
|
|
|
|
char const *offer = NONE, *answer = NONE;
|
|
|
|
isize_t offerlen = (isize_t)-1, answerlen = (isize_t)-1;
|
|
|
|
|
|
|
|
sdp_session_t const *b_sdp;
|
|
|
|
|
|
|
|
char const a_caps[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8 97\r\n"
|
|
|
|
"a=rtpmap:97 GSM/8000\n"
|
|
|
|
;
|
|
|
|
|
|
|
|
char const b_caps[] =
|
|
|
|
"m=audio 0 RTP/AVP 96 97\n"
|
|
|
|
"a=rtpmap:96 G7231/8000\n"
|
|
|
|
"a=rtpmap:97 G729/8000\n";
|
|
|
|
|
|
|
|
TEST_1(a = soa_create("static", ctx->root, ctx));
|
|
|
|
TEST_1(b = soa_create("static", ctx->root, ctx));
|
|
|
|
|
|
|
|
TEST(soa_set_user_sdp(a, 0, a_caps, strlen(a_caps)), 1);
|
|
|
|
TEST(soa_set_user_sdp(b, 0, b_caps, strlen(b_caps)), 1);
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 0);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_REJECTED);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_REJECTED);
|
|
|
|
|
|
|
|
TEST_VOID(soa_terminate(a, NULL));
|
|
|
|
TEST_VOID(soa_terminate(b, NULL));
|
|
|
|
|
|
|
|
TEST_VOID(soa_destroy(a));
|
|
|
|
TEST_VOID(soa_destroy(b));
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-03-05 21:12:12 +00:00
|
|
|
int test_media_replace2(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
int n;
|
|
|
|
|
|
|
|
soa_session_t *a, *b;
|
|
|
|
|
|
|
|
char const *offer = NONE, *answer = NONE;
|
|
|
|
isize_t offerlen = (isize_t)-1, answerlen = (isize_t)-1;
|
|
|
|
|
|
|
|
sdp_session_t const *a_sdp, *b_sdp;
|
|
|
|
sdp_media_t const *m;
|
|
|
|
|
|
|
|
char const a_caps[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=a 432432423423 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5004 RTP/AVP 0 8\n"
|
|
|
|
"a=rtpmap:96 G7231/8000\n"
|
|
|
|
"a=rtpmap:97 G729/8000\n"
|
|
|
|
"m=image 5556 UDPTL t38\r\n"
|
|
|
|
"a=T38FaxVersion:0\r\n"
|
|
|
|
"a=T38MaxBitRate:9600\r\n"
|
|
|
|
"a=T38FaxFillBitRemoval:0\r\n"
|
|
|
|
"a=T38FaxTranscodingMMR:0\r\n"
|
|
|
|
"a=T38FaxTranscodingJBIG:0\r\n"
|
|
|
|
"a=T38FaxRateManagement:transferredTCF\r\n"
|
|
|
|
"a=T38FaxMaxDatagram:400\r\n";
|
|
|
|
|
|
|
|
char const a_caps2[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=a 432432423423 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=image 5004 UDPTL t38\r\n"
|
|
|
|
"a=T38FaxVersion:0\r\n"
|
|
|
|
"a=T38MaxBitRate:9600\r\n"
|
|
|
|
"a=T38FaxFillBitRemoval:0\r\n"
|
|
|
|
"a=T38FaxTranscodingMMR:0\r\n"
|
|
|
|
"a=T38FaxTranscodingJBIG:0\r\n"
|
|
|
|
"a=T38FaxRateManagement:transferredTCF\r\n"
|
|
|
|
"a=T38FaxMaxDatagram:400\r\n";
|
|
|
|
|
|
|
|
char const b_caps[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5008 RTP/AVP 0 8\r\n"
|
|
|
|
;
|
|
|
|
|
|
|
|
char const b_caps2[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=image 5008 UDPTL t38\r\n"
|
|
|
|
;
|
|
|
|
|
|
|
|
TEST_1(a = soa_create("static", ctx->root, ctx));
|
|
|
|
TEST_1(b = soa_create("static", ctx->root, ctx));
|
|
|
|
|
|
|
|
TEST_1(soa_set_params(a, SOATAG_ORDERED_USER(1),
|
|
|
|
SOATAG_REUSE_REJECTED(1),
|
|
|
|
TAG_END()) > 0);
|
|
|
|
TEST_1(soa_set_params(b, SOATAG_ORDERED_USER(1),
|
|
|
|
SOATAG_REUSE_REJECTED(1),
|
|
|
|
TAG_END()) > 0);
|
|
|
|
|
|
|
|
TEST(soa_set_user_sdp(a, 0, a_caps, strlen(a_caps)), 1);
|
|
|
|
TEST(soa_set_user_sdp(b, 0, b_caps, strlen(b_caps)), 1);
|
|
|
|
|
|
|
|
n = soa_generate_offer(a, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, NULL, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
n = soa_get_local_sdp(b, NULL, &answer, &answerlen); TEST(n, 0);
|
|
|
|
n = soa_generate_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(a, test_completed); TEST(n, 0);
|
|
|
|
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, NULL, NULL); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV);
|
|
|
|
|
|
|
|
TEST_1(a_sdp->sdp_media);
|
|
|
|
TEST_1(a_sdp->sdp_media->m_type == sdp_media_audio);
|
|
|
|
TEST_1(a_sdp->sdp_media->m_next);
|
|
|
|
TEST_1(a_sdp->sdp_media->m_next->m_type == sdp_media_image);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
/* Re-O/A: replace media stream */
|
|
|
|
|
|
|
|
/* Accept media without common codecs */
|
|
|
|
TEST_1(soa_set_params(b, SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_USER_SDP_STR(b_caps2),
|
|
|
|
TAG_END()) > 0);
|
|
|
|
|
|
|
|
n = soa_generate_offer(b, 1, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, &offer, &offerlen); TEST(n, 1);
|
|
|
|
TEST_1(offer != NULL && offer != NONE);
|
|
|
|
n = soa_set_remote_sdp(a, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
/*printf("offer 2:\n%s", offer);*/
|
|
|
|
TEST_1(soa_set_params(a, SOATAG_RTP_MISMATCH(0),
|
|
|
|
SOATAG_USER_SDP_STR(a_caps2),
|
|
|
|
TAG_END()) > 0);
|
|
|
|
|
|
|
|
n = soa_generate_answer(a, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(a, &a_sdp, &answer, &answerlen); TEST(n, 1);
|
|
|
|
TEST_1(answer != NULL && answer != NONE);
|
|
|
|
/*printf("answer 2:\n%s", answer);*/
|
|
|
|
n = soa_set_remote_sdp(b, 0, answer, -1); TEST(n, 1);
|
|
|
|
n = soa_process_answer(b, test_completed); TEST(n, 0);
|
|
|
|
n = soa_get_local_sdp(b, &b_sdp, NULL, NULL); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(a));
|
|
|
|
TEST(soa_activate(a, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(b));
|
|
|
|
TEST(soa_activate(b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_1(m = a_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST(m->m_type, sdp_media_image);
|
|
|
|
TEST(m->m_proto, sdp_proto_udptl);
|
|
|
|
TEST_1(m->m_format);
|
|
|
|
TEST_S(m->m_format->l_text, "t38");
|
|
|
|
|
|
|
|
TEST_1(m = b_sdp->sdp_media); TEST_1(!m->m_rejected);
|
|
|
|
TEST(m->m_type, sdp_media_image);
|
|
|
|
TEST(m->m_proto, sdp_proto_udptl);
|
|
|
|
TEST_1(m->m_format);
|
|
|
|
TEST_S(m->m_format->l_text, "t38");
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
TEST_VOID(soa_terminate(a, NULL));
|
|
|
|
TEST_VOID(soa_terminate(b, NULL));
|
|
|
|
|
|
|
|
TEST_VOID(soa_destroy(a));
|
|
|
|
TEST_VOID(soa_destroy(b));
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
int test_asynch_offer_answer(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
|
2008-01-26 19:48:14 +00:00
|
|
|
#if 0 /* This has never been implemented */
|
2006-12-21 06:30:28 +00:00
|
|
|
int n;
|
|
|
|
|
|
|
|
char const *caps = NONE, *offer = NONE, *answer = NONE;
|
|
|
|
isize_t capslen = -1, offerlen = -1, answerlen = -1;
|
|
|
|
|
|
|
|
char const a[] =
|
|
|
|
"v=0\r\n"
|
|
|
|
"o=left 219498671 2 IN IP4 127.0.0.2\r\n"
|
|
|
|
"c=IN IP4 127.0.0.2\r\n"
|
|
|
|
"m=audio 5004 RTP/AVP 0 8\r\n";
|
|
|
|
|
|
|
|
char const b[] =
|
|
|
|
"v=0\n"
|
|
|
|
"o=right 93298573265 321974 IN IP4 127.0.0.3\n"
|
|
|
|
"c=IN IP4 127.0.0.3\n"
|
|
|
|
"m=audio 5006 RTP/AVP 96\n"
|
|
|
|
"m=rtpmap:96 GSM/8000\n";
|
|
|
|
|
|
|
|
n = soa_set_capability_sdp(ctx->asynch.a, 0,
|
|
|
|
"m=audio 5004 RTP/AVP 0 8", -1);
|
|
|
|
TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_set_capability_sdp(ctx->asynch.a, 0, a, strlen(a)); TEST(n, 1);
|
|
|
|
n = soa_get_capability_sdp(ctx->asynch.a, 0, &caps, &capslen); TEST(n, 1);
|
|
|
|
|
|
|
|
TEST_1(caps != NULL && caps != NONE);
|
|
|
|
TEST_1(capslen > 0);
|
|
|
|
|
|
|
|
n = soa_set_capability_sdp(ctx->asynch.b, 0, b, strlen(b)); TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_generate_offer(ctx->asynch.a, 1, test_completed); TEST(n, 1);
|
|
|
|
|
|
|
|
su_root_run(ctx->root); TEST(ctx->completed, ctx->asynch.a);
|
|
|
|
ctx->completed = NULL;
|
|
|
|
|
|
|
|
n = soa_get_local_sdp(ctx->asynch.a, 0, &offer, &offerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_set_remote_sdp(ctx->asynch.b, 0, offer, offerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_generate_answer(ctx->asynch.b, test_completed); TEST(n, 1);
|
|
|
|
|
|
|
|
su_root_run(ctx->root); TEST(ctx->completed, ctx->asynch.b);
|
|
|
|
ctx->completed = NULL;
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(ctx->asynch.b));
|
|
|
|
TEST(soa_activate(ctx->asynch.b, NULL), 0);
|
|
|
|
|
|
|
|
n = soa_get_local_sdp(ctx->asynch.b, 0, &answer, &answerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_set_remote_sdp(ctx->asynch.a, 0, answer, answerlen); TEST(n, 1);
|
|
|
|
|
|
|
|
n = soa_process_answer(ctx->asynch.a, test_completed); TEST(n, 1);
|
|
|
|
|
|
|
|
su_root_run(ctx->root); TEST(ctx->completed, ctx->asynch.a);
|
|
|
|
ctx->completed = NULL;
|
|
|
|
|
|
|
|
TEST_1(soa_is_complete(ctx->asynch.a));
|
|
|
|
TEST(soa_activate(ctx->asynch.a, NULL), 0);
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(ctx->asynch.a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_video_active(ctx->asynch.a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_image_active(ctx->asynch.a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_chat_active(ctx->asynch.a), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
TEST(soa_is_remote_audio_active(ctx->asynch.a), SOA_ACTIVE_SENDRECV);
|
|
|
|
TEST(soa_is_remote_video_active(ctx->asynch.a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_image_active(ctx->asynch.a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_chat_active(ctx->asynch.a), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
TEST(soa_deactivate(ctx->asynch.a, NULL), 0);
|
|
|
|
TEST(soa_deactivate(ctx->asynch.b, NULL), 0);
|
|
|
|
|
|
|
|
TEST_VOID(soa_terminate(ctx->asynch.a, NULL));
|
|
|
|
|
|
|
|
TEST(soa_is_audio_active(ctx->asynch.a), SOA_ACTIVE_DISABLED);
|
|
|
|
TEST(soa_is_remote_audio_active(ctx->asynch.a), SOA_ACTIVE_DISABLED);
|
|
|
|
|
|
|
|
TEST_VOID(soa_terminate(ctx->asynch.b, NULL));
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_deinit(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
Merge up to the most recent sofia-sip darcs tree. Includes the following patches from darcs:
Tue Aug 21 09:38:59 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_udp.c: checking error while checking that MSG_TRUNC works.
Shall I pull this patch? (1/43) [ynWvpxqadjk], or ? for help: y
Tue Aug 21 10:49:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_params.c: NUTAG_SIPS_URL() now sets the handle target, too.
Problem reported by Jari Tenhunen.
Shall I pull this patch? (2/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 11:22:42 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: do not destroy INVITE transaction if it has been CANCELed
Handle gracefully cases where the INVITE transaction is destroyed
immediately after canceling it. The old behaviour was to left it up to the
application to ACK the final response returned to INVITE.
Thanks for Fabio Margarido for reporting this problem.
Shall I pull this patch? (3/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 13:02:01 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added test with user SDP containing already rejected media
Shall I pull this patch? (4/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (5/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (6/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:00:10 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: disabled nta_msg_ackbye(). Fix for sf.net bug #1750691
Thanks for Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (7/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 06:54:38 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1750691
Shall I pull this patch? (8/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:03:45 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for nua_bye() sending CANCEL
Shall I pull this patch? (9/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 31 12:08:09 EDT 2007 Pekka.Pessi@nokia.com
* url.c: fixed escaping of '/' %2F, ';' %3B and '=' %3D in URL path/params
Thanks for Fabio Margarido for reporting this bug.
Shall I pull this patch? (10/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 3 10:14:55 EDT 2007 Pekka.Pessi@nokia.com
* url.c: do not un-escape %40 in URI parameters.
Do not unescape %2C, %3B, %3D, or %40 in URI parameters, nor
%2C, %2F, %3B, %3D, or %40 in URI path.
The @ sign can be ambiguous in the SIP URL, e.g.,
<sip:test.info;p=value@test.com>
can be parsed in two ways:
1) username contains test.info;param=value and host part has test.com
2) empty username, host part test.info, URI parameter p=value@test.com
Previously Sofia URL parser converted escaped '@' at signs (%40) in the URI
parameters to the unescaped form. The resulting URI could be ambiguous and
sometimes fail the syntax check if there was no '@' sign before the
unescaped one.
Thanks for Jan van den Bosch and Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (11/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 04:59:57 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed indenting, logging
Shall I pull this patch? (12/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 13 12:47:33 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.h, nua/test_proxy.c: added support for multiple domains
Each domain has its own registrar and authentication module.
Shall I pull this patch? (13/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:19:33 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: added timestamp to event logging
Shall I pull this patch? (14/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:20:12 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed timing problems in testing.
Shall I pull this patch? (15/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:04 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: reduce su_root_step() delay to 0.1 seconds
Shall I pull this patch? (16/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:22 EDT 2007 Pekka.Pessi@nokia.com
* test_register.c: fixed timing problem
Shall I pull this patch? (17/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 17:03:46 EDT 2007 Pekka.Pessi@nokia.com
* test_100rel.c: fixed timing problems resulting in events being reordered
Shall I pull this patch? (18/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:40:53 EDT 2007 Pekka.Pessi@nokia.com
* nua (test_init.c, test_register.c): using test_proxy domains
Shall I pull this patch? (19/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 12:12:32 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added cleanup code
Shall I pull this patch? (20/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:35:35 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: increase lifetime of ACK transaction from T4 to T1 x 64
nta.c creates a ACK transaction in order to restransmit ACK requests when
ever a retransmitted 2XX response to INVITE is received. The UAS retransmits
the 2XX responses for 64 x T1 (32 second by default).
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (21/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 10:21:04 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: generating libsofia-sip-ua/docs/Doxyfile.rfc before making manpages
Shall I pull this patch? (22/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:05:33 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING()
Shall I pull this patch? (23/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:09:06 EDT 2007 Pekka.Pessi@nokia.com
* tport: added ping-pong keepalive on TCP. replaced single tick with connection-specific timer
Now detecting closed connections on TLS, too.
Added tests for idle timeout, receive timeout, ping-pong timeout.
Shall I pull this patch? (24/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 6 10:19:32 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: added nta_incoming_received()
Shall I pull this patch? (25/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:29:56 EDT 2007 Pekka.Pessi@nokia.com
* nua_session.c: delay transition to ready when O/A is incomplete
Delay sending ACK and subsequent transition of call to the ready state when
the 200 OK response to the INVITE is received if the SDP Offer/Answer
exchange using UPDATE/PRACK was still incomplete.
Previously, if the O/A using UPDATE or PRACK was incomplete and an 200 OK
was received, the call setup logic regarded this as a fatal error and
terminated the call.
Thanks for Mike Jerris for detecting and reporting this bug.
Shall I pull this patch? (26/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:22:46 EDT 2007 Pekka.Pessi@nokia.com
* test_call_reject.c: testing Retry-After
Shall I pull this patch? (27/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:42:51 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using rudimentary outbound support in B's proxy.
Shall I pull this patch? (28/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:48:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: added some logging to nua_register_connection_closed()
Shall I pull this patch? (29/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:43:57 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using AUTHTAG_MAX_NCOUNT(1) for Mr. C
C is now challenged every time.
Shall I pull this patch? (30/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 11:05:19 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_100rel.c: fixed timing problem re response to PRACK and ACK
Shall I pull this patch? (31/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 06:02:50 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* DIST_SUBDIRS must include everything unconditionally
Shall I pull this patch? (32/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:53:04 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: silenced warnings
Shall I pull this patch? (33/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
* nua: refactored dialog refresh code
Shall I pull this patch? (34/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nua: refactored dialog refresh code
Shall I pull this patch? (35/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:01:25 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc]: renamed functions setting refresh interval
Shall I pull this patch? (36/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:15:03 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc], nua_stack.c: added nua_dialog_repeat_shutdown()
Shall I pull this patch? (37/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:19:20 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.h: renamed nua_remote_t as nua_dialog_peer_info_t
Shall I pull this patch? (38/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:23:04 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack.c: added timer to client request in order to implement Retry-After
Shall I pull this patch? (39/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:33:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: added backpointers to nua_dialog_usage_t and nua_dialog_state_t
Shall I pull this patch? (40/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:56:48 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: abort() in timeout alarm function if -a is given
Shall I pull this patch? (41/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 17:13:18 EDT 2007 Pekka.Pessi@nokia.com
* nua_subnotref.c: include SIPTAG_EVENT() in the nua_i_notify tag list
Shall I pull this patch? (42/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 10 12:27:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: save Contact from target refresh request or response.
Save the Contact header which the application has added to the target
refresh requests or responses and use the saved contact in subsequent target
refresh requests or responses.
Previously the application had no way of specifying the Contact included in
the automatic responses to target refresh requests.
Thanks for Anthony Minessale for reporting this problem.
Shall I pull this patch? (43/43) [ynWvpxqadjk], or ? for help: y
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5692 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-09-10 20:45:25 +00:00
|
|
|
|
|
|
|
su_root_destroy(ctx->root), ctx->root = NULL;
|
|
|
|
soa_destroy(ctx->a);
|
|
|
|
soa_destroy(ctx->b);
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
#if HAVE_ALARM
|
|
|
|
static RETSIGTYPE sig_alarm(int s)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "%s: FAIL! test timeout!\n", name);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
void usage(int exitcode)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
|
|
|
fprintf(stderr,
|
2007-04-15 02:03:41 +00:00
|
|
|
"usage: %s [-v|-q] [-a] [-l level] [-p outbound-proxy-uri]\n",
|
2006-12-21 06:30:28 +00:00
|
|
|
name);
|
2007-04-15 02:03:41 +00:00
|
|
|
exit(exitcode);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int retval = 0, quit_on_single_failure = 0;
|
|
|
|
int i, o_attach = 0, o_alarm = 1;
|
|
|
|
|
|
|
|
struct context ctx[1] = {{{ SU_HOME_INIT(ctx) }}};
|
|
|
|
|
|
|
|
for (i = 1; argv[i]; i++) {
|
|
|
|
if (strcmp(argv[i], "-v") == 0)
|
|
|
|
tstflags |= tst_verbatim;
|
2007-04-15 02:03:41 +00:00
|
|
|
else if (strcmp(argv[i], "-a") == 0)
|
|
|
|
tstflags |= tst_abort;
|
2006-12-21 06:30:28 +00:00
|
|
|
else if (strcmp(argv[i], "-q") == 0)
|
|
|
|
tstflags &= ~tst_verbatim;
|
|
|
|
else if (strcmp(argv[i], "-1") == 0)
|
|
|
|
quit_on_single_failure = 1;
|
|
|
|
else if (strncmp(argv[i], "-l", 2) == 0) {
|
|
|
|
int level = 3;
|
|
|
|
char *rest = NULL;
|
|
|
|
|
|
|
|
if (argv[i][2])
|
|
|
|
level = strtol(argv[i] + 2, &rest, 10);
|
|
|
|
else if (argv[i + 1])
|
|
|
|
level = strtol(argv[i + 1], &rest, 10), i++;
|
|
|
|
else
|
|
|
|
level = 3, rest = "";
|
|
|
|
|
|
|
|
if (rest == NULL || *rest)
|
2007-04-15 02:03:41 +00:00
|
|
|
usage(1);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
su_log_set_level(soa_log, level);
|
|
|
|
}
|
|
|
|
else if (strcmp(argv[i], "--attach") == 0) {
|
|
|
|
o_attach = 1;
|
|
|
|
}
|
|
|
|
else if (strcmp(argv[i], "--no-alarm") == 0) {
|
|
|
|
o_alarm = 0;
|
|
|
|
}
|
|
|
|
else if (strcmp(argv[i], "-") == 0) {
|
|
|
|
i++; break;
|
|
|
|
}
|
|
|
|
else if (argv[i][0] != '-') {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
2007-04-15 02:03:41 +00:00
|
|
|
usage(1);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
#if HAVE_OPEN_C
|
|
|
|
tstflags |= tst_verbatim;
|
|
|
|
#endif
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
if (o_attach) {
|
|
|
|
char line[10];
|
|
|
|
printf("%s: pid %u\n", name, getpid());
|
|
|
|
printf("<Press RETURN to continue>\n");
|
|
|
|
fgets(line, sizeof line, stdin);
|
|
|
|
}
|
|
|
|
#if HAVE_ALARM
|
|
|
|
else if (o_alarm) {
|
|
|
|
alarm(60);
|
|
|
|
signal(SIGALRM, sig_alarm);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
su_init();
|
|
|
|
|
|
|
|
if (!(TSTFLAGS & tst_verbatim)) {
|
|
|
|
su_log_soft_set_level(soa_log, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SINGLE_FAILURE_CHECK() \
|
|
|
|
do { fflush(stdout); \
|
|
|
|
if (retval && quit_on_single_failure) { su_deinit(); return retval; } \
|
|
|
|
} while(0)
|
|
|
|
|
|
|
|
retval |= test_api_errors(ctx); SINGLE_FAILURE_CHECK();
|
|
|
|
retval |= test_soa_tags(ctx); SINGLE_FAILURE_CHECK();
|
|
|
|
retval |= test_init(ctx, argv + i); SINGLE_FAILURE_CHECK();
|
|
|
|
if (retval == 0) {
|
2008-03-05 21:12:12 +00:00
|
|
|
retval |= test_media_replace2(ctx); SINGLE_FAILURE_CHECK();
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
retval |= test_params(ctx); SINGLE_FAILURE_CHECK();
|
|
|
|
retval |= test_static_offer_answer(ctx); SINGLE_FAILURE_CHECK();
|
|
|
|
retval |= test_codec_selection(ctx); SINGLE_FAILURE_CHECK();
|
Update sofia-sip from darcs:
Mon May 14 12:43:07 EDT 2007 martti.mela@nokia.com
* su_base_port.c: fixed a double free in su_base_port_start_shared().
Fri May 25 13:56:23 EDT 2007 Pekka.Pessi@nokia.com
* soa: added SOATAG_ORDERED_USER(), SOATAG_REUSE_REJECTED().
Allow replacing existing m=lines.
Sun May 27 14:52:13 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.c: fixed bug #1726034
Mon May 28 04:57:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nth.c: using non-blocking connect in test program, too.
Mon May 28 04:58:05 EDT 2007 Pekka.Pessi@nokia.com
* su.c: making all sockets non-blocking by default.
Mon May 28 04:59:28 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su.m4: moved contents into sac-s2.m4
Mon May 28 05:32:26 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed May 30 10:37:53 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su2.m4: added configure option --disable-tag-cast.
Added SU_INLINE_TAG_CAST into sofia-sip/su_configure.h{,.in}.
Using SU_INLINE_TAG_CAST in
sofia-sip/sip_tag.h{,.in}
sofia-sip/http_tag.h{,.in}
sofia-sip/su_tag.h
sofia-sip/su_tag_io.h
sofia-sip/auth_module.h
sofia-sip/nth_tag.h
sofia-sip/nua_tag.h
Fri Jun 1 15:11:52 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed tport_set_params() with secondary transports
Fri Jun 1 15:13:23 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_tcp.c: checking for end-of-stream even if su_getmsgsize() promised more data
Fri Jun 1 15:15:34 EDT 2007 Pekka.Pessi@nokia.com
* tport: added tport_is_clear_to_send(), allow use of tport_pending() without msg
The error callback from tport can now be registered even if there is no
request pending on transport (e.g., when keeping a transport connection open
for inbound messages).
Fri Jun 1 15:16:43 EDT 2007 Pekka.Pessi@nokia.com
* nta: not retrying after an transport error if application provided the transport
Fri Jun 1 15:17:23 EDT 2007 Pekka.Pessi@nokia.com
* sip: do not accept empty URIs (<>) in From, To, and other headers expecting name-addr format
Fri Jun 1 15:17:43 EDT 2007 Pekka.Pessi@nokia.com
* torture_url.c: added test for parsing empty URLs.
Fri Jun 1 15:19:27 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.[hc]: use registered connections for outbound with TCP.
Added test_proxy_close_tports() used testing recovering from TCP failures.
Fri Jun 1 15:20:33 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: added --print-tags and --tags-a, --tags=b and --tags=c options
Added more functions for handling events
Fri Jun 1 15:22:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed some tests depending on delivery of responses in correct order
Reordering might happen if some messages are sent over TCP, other over UDP.
Fri Jun 1 15:27:55 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: re-registering in case the TCP connection towards proxy is closed
In test_nua, Mr. B is now using TCP with the test proxy.
Fri Jun 1 15:35:39 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_refer.c: fixed SIP payload checks
Fri Jun 1 15:36:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_internal.h: added orq_user_tport field
Tue Jun 5 06:16:43 EDT 2007 Pekka.Pessi@nokia.com
* hide_email.sh: now fixing links, too.
Fri Jun 15 05:34:29 EDT 2007 Pekka.Pessi@nokia.com
* nua: fixed documentation entries for API functions left out from doxygen
Thanks for Jerry Ricahrds for pointing this out.
Wed May 23 10:26:26 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Correct documentation for parameter type of NUTAG_WITH_SAVED
Mon Jun 18 12:34:58 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Make nua_saved_event_request() and hence NUTAG_WITH_SAVED resilient to a NULL event content
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5413 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-06-20 10:41:15 +00:00
|
|
|
retval |= test_media_replace(ctx); SINGLE_FAILURE_CHECK();
|
Merge up to the most recent sofia-sip darcs tree. Includes the following patches from darcs:
Tue Aug 21 09:38:59 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_udp.c: checking error while checking that MSG_TRUNC works.
Shall I pull this patch? (1/43) [ynWvpxqadjk], or ? for help: y
Tue Aug 21 10:49:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_params.c: NUTAG_SIPS_URL() now sets the handle target, too.
Problem reported by Jari Tenhunen.
Shall I pull this patch? (2/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 11:22:42 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: do not destroy INVITE transaction if it has been CANCELed
Handle gracefully cases where the INVITE transaction is destroyed
immediately after canceling it. The old behaviour was to left it up to the
application to ACK the final response returned to INVITE.
Thanks for Fabio Margarido for reporting this problem.
Shall I pull this patch? (3/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 13:02:01 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added test with user SDP containing already rejected media
Shall I pull this patch? (4/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (5/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (6/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:00:10 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: disabled nta_msg_ackbye(). Fix for sf.net bug #1750691
Thanks for Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (7/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 06:54:38 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1750691
Shall I pull this patch? (8/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:03:45 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for nua_bye() sending CANCEL
Shall I pull this patch? (9/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 31 12:08:09 EDT 2007 Pekka.Pessi@nokia.com
* url.c: fixed escaping of '/' %2F, ';' %3B and '=' %3D in URL path/params
Thanks for Fabio Margarido for reporting this bug.
Shall I pull this patch? (10/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 3 10:14:55 EDT 2007 Pekka.Pessi@nokia.com
* url.c: do not un-escape %40 in URI parameters.
Do not unescape %2C, %3B, %3D, or %40 in URI parameters, nor
%2C, %2F, %3B, %3D, or %40 in URI path.
The @ sign can be ambiguous in the SIP URL, e.g.,
<sip:test.info;p=value@test.com>
can be parsed in two ways:
1) username contains test.info;param=value and host part has test.com
2) empty username, host part test.info, URI parameter p=value@test.com
Previously Sofia URL parser converted escaped '@' at signs (%40) in the URI
parameters to the unescaped form. The resulting URI could be ambiguous and
sometimes fail the syntax check if there was no '@' sign before the
unescaped one.
Thanks for Jan van den Bosch and Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (11/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 04:59:57 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed indenting, logging
Shall I pull this patch? (12/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 13 12:47:33 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.h, nua/test_proxy.c: added support for multiple domains
Each domain has its own registrar and authentication module.
Shall I pull this patch? (13/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:19:33 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: added timestamp to event logging
Shall I pull this patch? (14/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:20:12 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed timing problems in testing.
Shall I pull this patch? (15/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:04 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: reduce su_root_step() delay to 0.1 seconds
Shall I pull this patch? (16/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:22 EDT 2007 Pekka.Pessi@nokia.com
* test_register.c: fixed timing problem
Shall I pull this patch? (17/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 17:03:46 EDT 2007 Pekka.Pessi@nokia.com
* test_100rel.c: fixed timing problems resulting in events being reordered
Shall I pull this patch? (18/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:40:53 EDT 2007 Pekka.Pessi@nokia.com
* nua (test_init.c, test_register.c): using test_proxy domains
Shall I pull this patch? (19/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 12:12:32 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added cleanup code
Shall I pull this patch? (20/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:35:35 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: increase lifetime of ACK transaction from T4 to T1 x 64
nta.c creates a ACK transaction in order to restransmit ACK requests when
ever a retransmitted 2XX response to INVITE is received. The UAS retransmits
the 2XX responses for 64 x T1 (32 second by default).
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (21/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 10:21:04 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: generating libsofia-sip-ua/docs/Doxyfile.rfc before making manpages
Shall I pull this patch? (22/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:05:33 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING()
Shall I pull this patch? (23/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:09:06 EDT 2007 Pekka.Pessi@nokia.com
* tport: added ping-pong keepalive on TCP. replaced single tick with connection-specific timer
Now detecting closed connections on TLS, too.
Added tests for idle timeout, receive timeout, ping-pong timeout.
Shall I pull this patch? (24/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 6 10:19:32 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: added nta_incoming_received()
Shall I pull this patch? (25/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:29:56 EDT 2007 Pekka.Pessi@nokia.com
* nua_session.c: delay transition to ready when O/A is incomplete
Delay sending ACK and subsequent transition of call to the ready state when
the 200 OK response to the INVITE is received if the SDP Offer/Answer
exchange using UPDATE/PRACK was still incomplete.
Previously, if the O/A using UPDATE or PRACK was incomplete and an 200 OK
was received, the call setup logic regarded this as a fatal error and
terminated the call.
Thanks for Mike Jerris for detecting and reporting this bug.
Shall I pull this patch? (26/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:22:46 EDT 2007 Pekka.Pessi@nokia.com
* test_call_reject.c: testing Retry-After
Shall I pull this patch? (27/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:42:51 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using rudimentary outbound support in B's proxy.
Shall I pull this patch? (28/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:48:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: added some logging to nua_register_connection_closed()
Shall I pull this patch? (29/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:43:57 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using AUTHTAG_MAX_NCOUNT(1) for Mr. C
C is now challenged every time.
Shall I pull this patch? (30/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 11:05:19 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_100rel.c: fixed timing problem re response to PRACK and ACK
Shall I pull this patch? (31/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 06:02:50 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* DIST_SUBDIRS must include everything unconditionally
Shall I pull this patch? (32/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:53:04 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: silenced warnings
Shall I pull this patch? (33/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
* nua: refactored dialog refresh code
Shall I pull this patch? (34/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nua: refactored dialog refresh code
Shall I pull this patch? (35/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:01:25 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc]: renamed functions setting refresh interval
Shall I pull this patch? (36/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:15:03 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc], nua_stack.c: added nua_dialog_repeat_shutdown()
Shall I pull this patch? (37/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:19:20 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.h: renamed nua_remote_t as nua_dialog_peer_info_t
Shall I pull this patch? (38/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:23:04 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack.c: added timer to client request in order to implement Retry-After
Shall I pull this patch? (39/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:33:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: added backpointers to nua_dialog_usage_t and nua_dialog_state_t
Shall I pull this patch? (40/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:56:48 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: abort() in timeout alarm function if -a is given
Shall I pull this patch? (41/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 17:13:18 EDT 2007 Pekka.Pessi@nokia.com
* nua_subnotref.c: include SIPTAG_EVENT() in the nua_i_notify tag list
Shall I pull this patch? (42/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 10 12:27:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: save Contact from target refresh request or response.
Save the Contact header which the application has added to the target
refresh requests or responses and use the saved contact in subsequent target
refresh requests or responses.
Previously the application had no way of specifying the Contact included in
the automatic responses to target refresh requests.
Thanks for Anthony Minessale for reporting this problem.
Shall I pull this patch? (43/43) [ynWvpxqadjk], or ? for help: y
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5692 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-09-10 20:45:25 +00:00
|
|
|
retval |= test_media_reject(ctx); SINGLE_FAILURE_CHECK();
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
retval |= test_asynch_offer_answer(ctx); SINGLE_FAILURE_CHECK();
|
|
|
|
}
|
|
|
|
retval |= test_deinit(ctx); SINGLE_FAILURE_CHECK();
|
|
|
|
|
|
|
|
su_deinit();
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
#if HAVE_OPEN_C
|
|
|
|
sleep(5);
|
|
|
|
#endif
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
return retval;
|
|
|
|
}
|