[svn-commits] rmudgett: branch rmudgett/sig_ss7 r261963 - /team/rmudgett/sig_ss7/channels/

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri May 7 16:44:22 CDT 2010


Author: rmudgett
Date: Fri May  7 16:44:18 2010
New Revision: 261963

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261963
Log:
Move all sig_ss7 specific code into sig_ss7.c.

It still compiles!  Does it still work?  Don't know.  Testing next.

Modified:
    team/rmudgett/sig_ss7/channels/chan_dahdi.c
    team/rmudgett/sig_ss7/channels/sig_ss7.c
    team/rmudgett/sig_ss7/channels/sig_ss7.h

Modified: team/rmudgett/sig_ss7/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/sig_ss7/channels/chan_dahdi.c?view=diff&rev=261963&r1=261962&r2=261963
==============================================================================
--- team/rmudgett/sig_ss7/channels/chan_dahdi.c (original)
+++ team/rmudgett/sig_ss7/channels/chan_dahdi.c Fri May  7 16:44:18 2010
@@ -514,183 +514,6 @@
 static int ringt_base = DEFAULT_RINGT;
 
 #ifdef HAVE_SS7
-/* BUGBUG sig_ss7 callback functions ----v*/
-#define SIG_SS7_DEADLOCK_AVOIDANCE(p) \
-	do { \
-		sig_ss7_unlock_private(p); \
-		usleep(1); \
-		sig_ss7_lock_private(p); \
-	} while (0)
-
-static void sig_ss7_unlock_private(struct sig_ss7_chan *p)
-{
-	if (p->calls->unlock_private) {
-		p->calls->unlock_private(p->chan_pvt);
-	}
-}
-
-static void sig_ss7_lock_private(struct sig_ss7_chan *p)
-{
-	if (p->calls->lock_private) {
-		p->calls->lock_private(p->chan_pvt);
-	}
-}
-
-void sig_ss7_set_alarm(struct sig_ss7_chan *p, int in_alarm)
-{
-	p->inalarm = in_alarm;
-	if (p->calls->set_alarm) {
-		p->calls->set_alarm(p->chan_pvt, in_alarm);
-	}
-}
-
-static void sig_ss7_set_dialing(struct sig_ss7_chan *p, int is_dialing)
-{
-	if (p->calls->set_dialing) {
-		p->calls->set_dialing(p->chan_pvt, is_dialing);
-	}
-}
-
-static void sig_ss7_set_digital(struct sig_ss7_chan *p, int is_digital)
-{
-	if (p->calls->set_digital) {
-		p->calls->set_digital(p->chan_pvt, is_digital);
-	}
-}
-
-static void sig_ss7_set_inservice(struct sig_ss7_chan *p, int is_inservice)
-{
-	if (p->calls->set_inservice) {
-		p->calls->set_inservice(p->chan_pvt, is_inservice);
-	}
-}
-
-static void sig_ss7_set_locallyblocked(struct sig_ss7_chan *p, int is_blocked)
-{
-	p->locallyblocked = is_blocked;
-	if (p->calls->set_locallyblocked) {
-		p->calls->set_locallyblocked(p->chan_pvt, is_blocked);
-	}
-}
-
-static void sig_ss7_set_remotelyblocked(struct sig_ss7_chan *p, int is_blocked)
-{
-	p->remotelyblocked = is_blocked;
-	if (p->calls->set_remotelyblocked) {
-		p->calls->set_remotelyblocked(p->chan_pvt, is_blocked);
-	}
-}
-
-/*!
- * \internal
- * \brief Set the caller id information in the parent module.
- * \since 1.8
- *
- * \param p sig_ss7 channel structure.
- *
- * \return Nothing
- */
-static void sig_ss7_set_caller_id(struct sig_ss7_chan *p)
-{
-	struct ast_party_caller caller;
-
-	if (p->calls->set_callerid) {
-		ast_party_caller_init(&caller);
-		caller.id.number = p->cid_num;
-		caller.id.name = p->cid_name;
-		if (!ast_strlen_zero(p->cid_subaddr)) {
-			caller.id.subaddress.valid = 1;
-			//caller.id.subaddress.type = 0;/* nsap */
-			//caller.id.subaddress.odd_even_indicator = 0;
-			caller.id.subaddress.str = p->cid_subaddr;
-		}
-		caller.id.number_type = p->cid_ton;
-		caller.id.number_presentation = p->callingpres;
-		caller.ani = p->cid_ani;
-		caller.ani2 = p->cid_ani2;
-		p->calls->set_callerid(p->chan_pvt, &caller);
-	}
-}
-
-/*!
- * \internal
- * \brief Set the Dialed Number Identifier.
- * \since 1.8
- *
- * \param p sig_ss7 channel structure.
- * \param dnid Dialed Number Identifier string.
- *
- * \return Nothing
- */
-static void sig_ss7_set_dnid(struct sig_ss7_chan *p, const char *dnid)
-{
-	if (p->calls->set_dnid) {
-		p->calls->set_dnid(p->chan_pvt, dnid);
-	}
-}
-
-static int sig_ss7_play_tone(struct sig_ss7_chan *p, enum sig_ss7_tone tone)
-{
-	int res;
-
-	if (p->calls->play_tone) {
-		res = p->calls->play_tone(p->chan_pvt, tone);
-	} else {
-		res = -1;
-	}
-	return res;
-}
-
-static int sig_ss7_set_echocanceller(struct sig_ss7_chan *p, int enable)
-{
-	if (p->calls->set_echocanceller) {
-		return p->calls->set_echocanceller(p->chan_pvt, enable);
-	}
-	return -1;
-}
-
-static void sig_ss7_loopback(struct sig_ss7_chan *p, int enable)
-{
-	if (p->loopedback != enable) {
-		p->loopedback = enable;
-		if (p->calls->set_loopback) {
-			p->calls->set_loopback(p->chan_pvt, enable);
-		}
-	}
-}
-
-static struct ast_channel *sig_ss7_new_ast_channel(struct sig_ss7_chan *p, int state, int ulaw, int transfercapability, char *exten, const struct ast_channel *requestor)
-{
-	struct ast_channel *ast;
-
-	if (p->calls->new_ast_channel) {
-		ast = p->calls->new_ast_channel(p->chan_pvt, state, ulaw, exten, requestor);
-	} else {
-		return NULL;
-	}
-
-	if (!p->owner) {
-		p->owner = ast;
-	}
-	p->alreadyhungup = 0;
-	ast->transfercapability = transfercapability;
-	pbx_builtin_setvar_helper(ast, "TRANSFERCAPABILITY",
-		ast_transfercapability2str(transfercapability));
-	if (transfercapability & AST_TRANS_CAP_DIGITAL) {
-		sig_ss7_set_digital(p, 1);
-	}
-
-	return ast;
-}
-
-static void sig_ss7_handle_link_exception(struct sig_ss7_linkset *linkset, int which)
-{
-	if (linkset->calls->handle_link_exception) {
-		linkset->calls->handle_link_exception(linkset, which);
-	}
-}
-
-/* BUGBUG sig_ss7 callback functions ----^*/
 
 struct dahdi_ss7 {
 	struct sig_ss7_linkset ss7;
@@ -3467,31 +3290,6 @@
 
 static struct dahdi_pvt *round_robin[32];
 
-#if defined(HAVE_SS7)
-static inline void ss7_rel(struct sig_ss7_linkset *ss7)
-{
-	ast_mutex_unlock(&ss7->lock);
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static inline int ss7_grab(struct sig_ss7_chan *pvt, struct sig_ss7_linkset *ss7)
-{
-	int res;
-	/* Grab the lock first */
-	do {
-		res = ast_mutex_trylock(&ss7->lock);
-		if (res) {
-			SIG_SS7_DEADLOCK_AVOIDANCE(pvt);
-		}
-	} while (res);
-	/* Then break the poll */
-	if (ss7->master != AST_PTHREADT_NULL)
-		pthread_kill(ss7->master, SIGURG);
-	return 0;
-}
-#endif	/* defined(HAVE_SS7) */
-
 static int dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nullok)
 {
 	int res;
@@ -3524,89 +3322,6 @@
 			break;
 	}
 }
-
-/* BUGBUG move to sig_ss7.c ----v */
-/*!
- * \internal
- * \brief Obtain the sig_ss7 owner channel lock if the owner exists.
- * \since 1.8
- *
- * \param ss7 sig_ss7 SS7 control structure.
- * \param chanpos Channel position in the span.
- *
- * \note Assumes the ss7->lock is already obtained.
- * \note Assumes the sig_ss7_lock_private(ss7->pvts[chanpos]) is already obtained.
- *
- * \return Nothing
- */
-static void sig_ss7_lock_owner(struct sig_ss7_linkset *ss7, int chanpos)
-{
-	for (;;) {
-		if (!ss7->pvts[chanpos]->owner) {
-			/* There is no owner lock to get. */
-			break;
-		}
-		if (!ast_channel_trylock(ss7->pvts[chanpos]->owner)) {
-			/* We got the lock */
-			break;
-		}
-		/* We must unlock the SS7 to avoid the possibility of a deadlock */
-		ast_mutex_unlock(&ss7->lock);
-		SIG_SS7_DEADLOCK_AVOIDANCE(ss7->pvts[chanpos]);
-		ast_mutex_lock(&ss7->lock);
-	}
-}
-
-/*!
- * \internal
- * \brief Queue the given frame onto the owner channel.
- * \since 1.8
- *
- * \param ss7 sig_ss7 SS7 control structure.
- * \param chanpos Channel position in the span.
- * \param frame Frame to queue onto the owner channel.
- *
- * \note Assumes the ss7->lock is already obtained.
- * \note Assumes the sig_ss7_lock_private(ss7->pvts[chanpos]) is already obtained.
- *
- * \return Nothing
- */
-static void sig_ss7_queue_frame(struct sig_ss7_linkset *ss7, int chanpos, struct ast_frame *frame)
-{
-	sig_ss7_lock_owner(ss7, chanpos);
-	if (ss7->pvts[chanpos]->owner) {
-		ast_queue_frame(ss7->pvts[chanpos]->owner, frame);
-		ast_channel_unlock(ss7->pvts[chanpos]->owner);
-	}
-}
-
-/*!
- * \internal
- * \brief Queue a control frame of the specified subclass onto the owner channel.
- * \since 1.8
- *
- * \param ss7 sig_ss7 SS7 control structure.
- * \param chanpos Channel position in the span.
- * \param subclass Control frame subclass to queue onto the owner channel.
- *
- * \note Assumes the ss7->lock is already obtained.
- * \note Assumes the sig_ss7_lock_private(ss7->pvts[chanpos]) is already obtained.
- *
- * \return Nothing
- */
-static void sig_ss7_queue_control(struct sig_ss7_linkset *ss7, int chanpos, int subclass)
-{
-	struct ast_frame f = {AST_FRAME_CONTROL, };
-	struct sig_ss7_chan *p = ss7->pvts[chanpos];
-
-	if (p->calls->queue_control) {
-		p->calls->queue_control(p->chan_pvt, subclass);
-	}
-
-	f.subclass.integer = subclass;
-	sig_ss7_queue_frame(ss7, chanpos, &f);
-}
-/* BUGBUG move to sig_ss7.c ----^ */
 
 static void dahdi_queue_frame(struct dahdi_pvt *p, struct ast_frame *f)
 {
@@ -5160,20 +4875,6 @@
 
 	return 0;
 }
-
-#if defined(HAVE_SS7)
-static unsigned char cid_pres2ss7pres(int cid_pres)
-{
-	 return (cid_pres >> 5) & 0x03;
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static unsigned char cid_pres2ss7screen(int cid_pres)
-{
-	return cid_pres & 0x03;
-}
-#endif	/* defined(HAVE_SS7) */
 
 static int dahdi_call(struct ast_channel *ast, char *rdest, int timeout)
 {
@@ -13192,808 +12893,6 @@
 	ast_mutex_unlock(&iflock);
 	return 0;
 }
-
-#if defined(HAVE_SS7)
-static int ss7_find_cic(struct sig_ss7_linkset *linkset, int cic, unsigned int dpc)
-{
-	int i;
-	int winner = -1;
-	for (i = 0; i < linkset->numchans; i++) {
-		if (linkset->pvts[i] && (linkset->pvts[i]->dpc == dpc && linkset->pvts[i]->cic == cic)) {
-			winner = i;
-			break;
-		}
-	}
-	return winner;
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static void ss7_handle_cqm(struct sig_ss7_linkset *linkset, int startcic, int endcic, unsigned int dpc)
-{
-	unsigned char status[32];
-	struct sig_ss7_chan *p = NULL;
-	int i, offset;
-
-	for (i = 0; i < linkset->numchans; i++) {
-		if (linkset->pvts[i] && (linkset->pvts[i]->dpc == dpc && ((linkset->pvts[i]->cic >= startcic) && (linkset->pvts[i]->cic <= endcic)))) {
-			p = linkset->pvts[i];
-			offset = p->cic - startcic;
-			status[offset] = 0;
-			if (p->locallyblocked)
-				status[offset] |= (1 << 0) | (1 << 4);
-			if (p->remotelyblocked)
-				status[offset] |= (1 << 1) | (1 << 5);
-			if (p->ss7call) {
-				if (p->outgoing)
-					status[offset] |= (1 << 3);
-				else
-					status[offset] |= (1 << 2);
-			} else
-				status[offset] |= 0x3 << 2;
-		}
-	}
-
-	if (p)
-		isup_cqr(linkset->ss7, startcic, endcic, dpc, status);
-	else
-		ast_log(LOG_WARNING, "Could not find any equipped circuits within CQM CICs\n");
-
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static inline void ss7_hangup_cics(struct sig_ss7_linkset *linkset, int startcic, int endcic, unsigned int dpc)
-{
-	int i;
-
-	for (i = 0; i < linkset->numchans; i++) {
-		if (linkset->pvts[i] && (linkset->pvts[i]->dpc == dpc && ((linkset->pvts[i]->cic >= startcic) && (linkset->pvts[i]->cic <= endcic)))) {
-			sig_ss7_lock_private(linkset->pvts[i]);
-			if (linkset->pvts[i]->owner)
-				linkset->pvts[i]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-			sig_ss7_unlock_private(linkset->pvts[i]);
-		}
-	}
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static inline void ss7_block_cics(struct sig_ss7_linkset *linkset, int startcic, int endcic, unsigned int dpc, unsigned char state[], int block)
-{
-	int i;
-
-	for (i = 0; i < linkset->numchans; i++) {
-		if (linkset->pvts[i] && (linkset->pvts[i]->dpc == dpc && ((linkset->pvts[i]->cic >= startcic) && (linkset->pvts[i]->cic <= endcic)))) {
-			if (state) {
-				if (state[i])
-					sig_ss7_set_remotelyblocked(linkset->pvts[i], block);
-			} else
-				sig_ss7_set_remotelyblocked(linkset->pvts[i], block);
-		}
-	}
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static void ss7_inservice(struct sig_ss7_linkset *linkset, int startcic, int endcic, unsigned int dpc)
-{
-	int i;
-
-	for (i = 0; i < linkset->numchans; i++) {
-		if (linkset->pvts[i] && (linkset->pvts[i]->dpc == dpc && ((linkset->pvts[i]->cic >= startcic) && (linkset->pvts[i]->cic <= endcic))))
-			sig_ss7_set_inservice(linkset->pvts[i], 1);
-	}
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static void ss7_reset_linkset(struct sig_ss7_linkset *linkset)
-{
-	int i, startcic = -1, endcic, dpc;
-
-	if (linkset->numchans <= 0)
-		return;
-
-	startcic = linkset->pvts[0]->cic;
-	/* DB: CIC's DPC fix */
-	dpc = linkset->pvts[0]->dpc;
-
-	for (i = 0; i < linkset->numchans; i++) {
-		if (linkset->pvts[i+1] && linkset->pvts[i+1]->dpc == dpc && ((linkset->pvts[i+1]->cic - linkset->pvts[i]->cic) == 1) && (linkset->pvts[i]->cic - startcic < 31)) {
-			continue;
-		} else {
-			endcic = linkset->pvts[i]->cic;
-			ast_verbose("Resetting CICs %d to %d\n", startcic, endcic);
-			isup_grs(linkset->ss7, startcic, endcic, dpc);
-
-			/* DB: CIC's DPC fix */
-			if (linkset->pvts[i+1]) {
-				startcic = linkset->pvts[i+1]->cic;
-				dpc = linkset->pvts[i+1]->dpc;
-			}
-		}
-	}
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-/* XXX: This function is assumed to be called with the private channel lock and linkset lock held */
-static void ss7_start_call(struct sig_ss7_chan *p, struct sig_ss7_linkset *linkset)
-{
-	struct ss7 *ss7 = linkset->ss7;
-	int law;
-	struct ast_channel *c;
-	char tmp[256];
-
-	if (!(linkset->flags & LINKSET_FLAG_EXPLICITACM)) {
-		p->proceeding = 1;
-		isup_acm(ss7, p->ss7call);
-	}
-
-	sig_ss7_set_caller_id(p);
-
-	if (linkset->type == SS7_ITU) {
-		law = SIG_SS7_ALAW;
-	} else {
-		law = SIG_SS7_ULAW;
-	}
-
-	/*
-	 * Release the SS7 lock while we create the channel
-	 * so other threads can send messages.
-	 */
-	ast_mutex_unlock(&linkset->lock);
-	c = sig_ss7_new_ast_channel(p, AST_STATE_RING, law, 0, p->exten, NULL);
-	if (!c) {
-		ast_log(LOG_WARNING, "Unable to start PBX on CIC %d\n", p->cic);
-		ast_mutex_lock(&linkset->lock);
-		isup_rel(linkset->ss7, p->ss7call, -1);
-		p->proceeding = 0;
-		p->alreadyhungup = 1;
-		return;
-	}
-
-	sig_ss7_set_echocanceller(p, 1);
-
-	/*
-	 * It is reasonably safe to set the following
-	 * channel variables while the channel private
-	 * structure is locked.  The PBX has not been
-	 * started yet and it is unlikely that any other task
-	 * will do anything with the channel we have just
-	 * created.
-	 *
-	 * We only reference these variables in the context of the ss7_linkset function
-	 * when receiving either and IAM or a COT message.
-	 */
-	if (!ast_strlen_zero(p->charge_number)) {
-		pbx_builtin_setvar_helper(c, "SS7_CHARGE_NUMBER", p->charge_number);
-		/* Clear this after we set it */
-		p->charge_number[0] = 0;
-	}
-	if (!ast_strlen_zero(p->gen_add_number)) {
-		pbx_builtin_setvar_helper(c, "SS7_GENERIC_ADDRESS", p->gen_add_number);
-		/* Clear this after we set it */
-		p->gen_add_number[0] = 0;
-	}
-	if (!ast_strlen_zero(p->jip_number)) {
-		pbx_builtin_setvar_helper(c, "SS7_JIP", p->jip_number);
-		/* Clear this after we set it */
-		p->jip_number[0] = 0;
-	}
-	if (!ast_strlen_zero(p->gen_dig_number)) {
-		pbx_builtin_setvar_helper(c, "SS7_GENERIC_DIGITS", p->gen_dig_number);
-		/* Clear this after we set it */
-		p->gen_dig_number[0] = 0;
-	}
-	if (!ast_strlen_zero(p->orig_called_num)) {
-		pbx_builtin_setvar_helper(c, "SS7_ORIG_CALLED_NUM", p->orig_called_num);
-		/* Clear this after we set it */
-		p->orig_called_num[0] = 0;
-	}
-
-	snprintf(tmp, sizeof(tmp), "%d", p->gen_dig_type);
-	pbx_builtin_setvar_helper(c, "SS7_GENERIC_DIGTYPE", tmp);
-	/* Clear this after we set it */
-	p->gen_dig_type = 0;
-
-	snprintf(tmp, sizeof(tmp), "%d", p->gen_dig_scheme);
-	pbx_builtin_setvar_helper(c, "SS7_GENERIC_DIGSCHEME", tmp);
-	/* Clear this after we set it */
-	p->gen_dig_scheme = 0;
-
-	if (!ast_strlen_zero(p->lspi_ident)) {
-		pbx_builtin_setvar_helper(c, "SS7_LSPI_IDENT", p->lspi_ident);
-		/* Clear this after we set it */
-		p->lspi_ident[0] = 0;
-	}
-
-	snprintf(tmp, sizeof(tmp), "%d", p->call_ref_ident);
-	pbx_builtin_setvar_helper(c, "SS7_CALLREF_IDENT", tmp);
-	/* Clear this after we set it */
-	p->call_ref_ident = 0;
-
-	snprintf(tmp, sizeof(tmp), "%d", p->call_ref_pc);
-	pbx_builtin_setvar_helper(c, "SS7_CALLREF_PC", tmp);
-	/* Clear this after we set it */
-	p->call_ref_pc = 0;
-
-	snprintf(tmp, sizeof(tmp), "%d", p->calling_party_cat);
-	pbx_builtin_setvar_helper(c, "SS7_CALLING_PARTY_CATEGORY", tmp);
-	/* Clear this after we set it */
-	p->calling_party_cat = 0;
-
-	if (!ast_strlen_zero(p->redirecting_num)) {
-		pbx_builtin_setvar_helper(c, "SS7_REDIRECTING_NUMBER", p->redirecting_num);
-		/* Clear this after we set it */
-		p->redirecting_num[0] = 0;
-	}
-	if (!ast_strlen_zero(p->generic_name)) {
-		pbx_builtin_setvar_helper(c, "SS7_GENERIC_NAME", p->generic_name);
-		/* Clear this after we set it */
-		p->generic_name[0] = 0;
-	}
-
-	if (ast_pbx_start(c)) {
-		ast_log(LOG_WARNING, "Unable to start PBX on %s (CIC %d)\n", c->name, p->cic);
-		ast_hangup(c);
-	} else {
-		ast_verb(3, "Accepting call to '%s' on CIC %d\n", p->exten, p->cic);
-	}
-	ast_mutex_lock(&linkset->lock);
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static void ss7_apply_plan_to_number(char *buf, size_t size, const struct sig_ss7_linkset *ss7, const char *number, const unsigned nai)
-{
-	if (ast_strlen_zero(number)) { /* make sure a number exists so prefix isn't placed on an empty string */
-		if (size) {
-			*buf = '\0';
-		}
-		return;
-	}
-	switch (nai) {
-	case SS7_NAI_INTERNATIONAL:
-		snprintf(buf, size, "%s%s", ss7->internationalprefix, number);
-		break;
-	case SS7_NAI_NATIONAL:
-		snprintf(buf, size, "%s%s", ss7->nationalprefix, number);
-		break;
-	case SS7_NAI_SUBSCRIBER:
-		snprintf(buf, size, "%s%s", ss7->subscriberprefix, number);
-		break;
-	case SS7_NAI_UNKNOWN:
-		snprintf(buf, size, "%s%s", ss7->unknownprefix, number);
-		break;
-	default:
-		snprintf(buf, size, "%s", number);
-		break;
-	}
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static int ss7_pres_scr2cid_pres(char presentation_ind, char screening_ind)
-{
-	return ((presentation_ind & 0x3) << 5) | (screening_ind & 0x3);
-}
-#endif	/* defined(HAVE_SS7) */
-
-#if defined(HAVE_SS7)
-static void *ss7_linkset(void *data)
-{
-	int res, i;
-	struct timeval *next = NULL, tv;
-	struct sig_ss7_linkset *linkset = (struct sig_ss7_linkset *) data;
-	struct ss7 *ss7 = linkset->ss7;
-	ss7_event *e = NULL;
-	struct sig_ss7_chan *p;
-	int chanpos;
-	struct pollfd pollers[SIG_SS7_NUM_DCHANS];
-	int cic;
-	unsigned int dpc;
-	int nextms = 0;
-
-	ss7_set_debug(ss7, SIG_SS7_DEBUG_DEFAULT);
-	ss7_start(ss7);
-
-	while(1) {
-		ast_mutex_lock(&linkset->lock);
-		if ((next = ss7_schedule_next(ss7))) {
-			tv = ast_tvnow();
-			tv.tv_sec = next->tv_sec - tv.tv_sec;
-			tv.tv_usec = next->tv_usec - tv.tv_usec;
-			if (tv.tv_usec < 0) {
-				tv.tv_usec += 1000000;
-				tv.tv_sec -= 1;
-			}
-			if (tv.tv_sec < 0) {
-				tv.tv_sec = 0;
-				tv.tv_usec = 0;
-			}
-			nextms = tv.tv_sec * 1000;
-			nextms += tv.tv_usec / 1000;
-		}
-		ast_mutex_unlock(&linkset->lock);
-
-		for (i = 0; i < linkset->numsigchans; i++) {
-			pollers[i].fd = linkset->fds[i];
-			pollers[i].events = ss7_pollflags(ss7, linkset->fds[i]);
-			pollers[i].revents = 0;
-		}
-
-		res = poll(pollers, linkset->numsigchans, nextms);
-		if ((res < 0) && (errno != EINTR)) {
-			ast_log(LOG_ERROR, "poll(%s)\n", strerror(errno));
-		} else if (!res) {
-			ast_mutex_lock(&linkset->lock);
-			ss7_schedule_run(ss7);
-			ast_mutex_unlock(&linkset->lock);
-			continue;
-		}
-
-		ast_mutex_lock(&linkset->lock);
-		for (i = 0; i < linkset->numsigchans; i++) {
-			if (pollers[i].revents & POLLPRI) {
-				sig_ss7_handle_link_exception(linkset, i);
-			}
-			if (pollers[i].revents & POLLIN) {
-				res = ss7_read(ss7, pollers[i].fd);
-			}
-			if (pollers[i].revents & POLLOUT) {
-				res = ss7_write(ss7, pollers[i].fd);
-				if (res < 0) {
-					ast_debug(1, "Error in write %s\n", strerror(errno));
-				}
-			}
-		}
-
-		while ((e = ss7_check_event(ss7))) {
-			switch (e->e) {
-			case SS7_EVENT_UP:
-				if (linkset->state != LINKSET_STATE_UP) {
-					ast_verbose("--- SS7 Up ---\n");
-					ss7_reset_linkset(linkset);
-				}
-				linkset->state = LINKSET_STATE_UP;
-				break;
-			case SS7_EVENT_DOWN:
-				ast_verbose("--- SS7 Down ---\n");
-				linkset->state = LINKSET_STATE_DOWN;
-				for (i = 0; i < linkset->numchans; i++) {
-					p = linkset->pvts[i];
-					if (p) {
-						sig_ss7_set_alarm(p, 1);
-					}
-				}
-				break;
-			case MTP2_LINK_UP:
-				ast_verbose("MTP2 link up (SLC %d)\n", e->gen.data);
-				break;
-			case MTP2_LINK_DOWN:
-				ast_log(LOG_WARNING, "MTP2 link down (SLC %d)\n", e->gen.data);
-				break;
-			case ISUP_EVENT_CPG:
-				chanpos = ss7_find_cic(linkset, e->cpg.cic, e->cpg.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "CPG on unconfigured CIC %d\n", e->cpg.cic);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				sig_ss7_lock_private(p);
-				switch (e->cpg.event) {
-				case CPG_EVENT_ALERTING:
-					p->alerting = 1;
-					sig_ss7_queue_control(linkset, chanpos, AST_CONTROL_RINGING);
-					break;
-				case CPG_EVENT_PROGRESS:
-				case CPG_EVENT_INBANDINFO:
-					{
-						ast_debug(1, "Queuing frame PROGRESS on CIC %d\n", p->cic);
-						sig_ss7_queue_control(linkset, chanpos, AST_CONTROL_PROGRESS);
-						p->progress = 1;
-						sig_ss7_set_dialing(p, 0);
-#if 0/* sig_pri seems to have just deleted this code. */
-/* BUGBUG dsp, dsp_features need equivalent. what done in sig_pri? */
-						if (p->dsp && p->dsp_features) {
-							ast_dsp_set_features(p->dsp, p->dsp_features);
-							p->dsp_features = 0;
-						}
-#endif
-					}
-					break;
-				default:
-					ast_debug(1, "Do not handle CPG with event type 0x%x\n", e->cpg.event);
-					break;
-				}
-
-				sig_ss7_unlock_private(p);
-				break;
-			case ISUP_EVENT_RSC:
-				ast_verbose("Resetting CIC %d\n", e->rsc.cic);
-				chanpos = ss7_find_cic(linkset, e->rsc.cic, e->rsc.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "RSC on unconfigured CIC %d\n", e->rsc.cic);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				sig_ss7_lock_private(p);
-				sig_ss7_set_inservice(p, 1);
-				sig_ss7_set_remotelyblocked(p, 0);
-				dpc = p->dpc;
-				isup_set_call_dpc(e->rsc.call, dpc);
-				if (p->ss7call)
-					p->ss7call = NULL;
-				if (p->owner)
-					p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-				sig_ss7_unlock_private(p);
-				isup_rlc(ss7, e->rsc.call);
-				break;
-			case ISUP_EVENT_GRS:
-				ast_debug(1, "Got Reset for CICs %d to %d: Acknowledging\n", e->grs.startcic, e->grs.endcic);
-				chanpos = ss7_find_cic(linkset, e->grs.startcic, e->grs.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "GRS on unconfigured CIC %d\n", e->grs.startcic);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				isup_gra(ss7, e->grs.startcic, e->grs.endcic, e->grs.opc);
-				ss7_block_cics(linkset, e->grs.startcic, e->grs.endcic, e->grs.opc, NULL, 0);
-				ss7_hangup_cics(linkset, e->grs.startcic, e->grs.endcic, e->grs.opc);
-				break;
-			case ISUP_EVENT_CQM:
-				ast_debug(1, "Got Circuit group query message from CICs %d to %d\n", e->cqm.startcic, e->cqm.endcic);
-				ss7_handle_cqm(linkset, e->cqm.startcic, e->cqm.endcic, e->cqm.opc);
-				break;
-			case ISUP_EVENT_GRA:
-				ast_verbose("Got reset acknowledgement from CIC %d to %d.\n", e->gra.startcic, e->gra.endcic);
-				ss7_inservice(linkset, e->gra.startcic, e->gra.endcic, e->gra.opc);
-				ss7_block_cics(linkset, e->gra.startcic, e->gra.endcic, e->gra.opc, e->gra.status, 1);
-				break;
-			case ISUP_EVENT_IAM:
- 				ast_debug(1, "Got IAM for CIC %d and called number %s, calling number %s\n", e->iam.cic, e->iam.called_party_num, e->iam.calling_party_num);
-				chanpos = ss7_find_cic(linkset, e->iam.cic, e->iam.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "IAM on unconfigured CIC %d\n", e->iam.cic);
-					isup_rel(ss7, e->iam.call, -1);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				sig_ss7_lock_private(p);
-				if (p->owner) {
-					if (p->ss7call == e->iam.call) {
-						sig_ss7_unlock_private(p);
-						ast_log(LOG_WARNING, "Duplicate IAM requested on CIC %d\n", e->iam.cic);
-						break;
-					} else {
-						sig_ss7_unlock_private(p);
-						ast_log(LOG_WARNING, "Ring requested on CIC %d already in use!\n", e->iam.cic);
-						break;
-					}
-				}
-
-				dpc = p->dpc;
-				p->ss7call = e->iam.call;
-				isup_set_call_dpc(p->ss7call, dpc);
-
-				if ((p->use_callerid) && (!ast_strlen_zero(e->iam.calling_party_num))) {
-					ss7_apply_plan_to_number(p->cid_num, sizeof(p->cid_num), linkset, e->iam.calling_party_num, e->iam.calling_nai);
-					p->callingpres = ss7_pres_scr2cid_pres(e->iam.presentation_ind, e->iam.screening_ind);
-				} else
-					p->cid_num[0] = 0;
-
-				/* Set DNID */
-				if (!ast_strlen_zero(e->iam.called_party_num)) {
-					ss7_apply_plan_to_number(p->exten, sizeof(p->exten), linkset,
-						e->iam.called_party_num, e->iam.called_nai);
-					sig_ss7_set_dnid(p, p->exten);
-				}
-
-				if (p->immediate) {
-					p->exten[0] = 's';
-					p->exten[1] = '\0';
-				} else if (!ast_strlen_zero(e->iam.called_party_num)) {
-					char *st;
-					ss7_apply_plan_to_number(p->exten, sizeof(p->exten), linkset, e->iam.called_party_num, e->iam.called_nai);
-					st = strchr(p->exten, '#');
-					if (st) {
-						*st = '\0';
-					}
-				} else {
-					p->exten[0] = '\0';
-				}
-
-				p->cid_ani[0] = '\0';
-				if ((p->use_callerid) && (!ast_strlen_zero(e->iam.generic_name)))
-					ast_copy_string(p->cid_name, e->iam.generic_name, sizeof(p->cid_name));
-				else
-					p->cid_name[0] = '\0';
-
-				p->cid_ani2 = e->iam.oli_ani2;
-				p->cid_ton = 0;
-				ast_copy_string(p->charge_number, e->iam.charge_number, sizeof(p->charge_number));
-				ast_copy_string(p->gen_add_number, e->iam.gen_add_number, sizeof(p->gen_add_number));
-				p->gen_add_type = e->iam.gen_add_type;
-				p->gen_add_nai = e->iam.gen_add_nai;
-				p->gen_add_pres_ind = e->iam.gen_add_pres_ind;
-				p->gen_add_num_plan = e->iam.gen_add_num_plan;
-				ast_copy_string(p->gen_dig_number, e->iam.gen_dig_number, sizeof(p->gen_dig_number));
-				p->gen_dig_type = e->iam.gen_dig_type;
-				p->gen_dig_scheme = e->iam.gen_dig_scheme;
-				ast_copy_string(p->jip_number, e->iam.jip_number, sizeof(p->jip_number));
-				ast_copy_string(p->orig_called_num, e->iam.orig_called_num, sizeof(p->orig_called_num));
-				ast_copy_string(p->redirecting_num, e->iam.redirecting_num, sizeof(p->redirecting_num));
-				ast_copy_string(p->generic_name, e->iam.generic_name, sizeof(p->generic_name));
-				p->calling_party_cat = e->iam.calling_party_cat;
-
-				if (ast_exists_extension(NULL, p->context, p->exten, 1, p->cid_num)) {
-
-					if (e->iam.cot_check_required) {
-						sig_ss7_loopback(p, 1);
-					} else
-						ss7_start_call(p, linkset);
-				} else {
-					ast_debug(1, "Call on CIC for unconfigured extension %s\n", p->exten);
-					p->alreadyhungup = 1;
-					isup_rel(ss7, e->iam.call, AST_CAUSE_UNALLOCATED);
-				}
-				sig_ss7_unlock_private(p);
-				break;
-			case ISUP_EVENT_COT:
-				chanpos = ss7_find_cic(linkset, e->cot.cic, e->cot.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "COT on unconfigured CIC %d\n", e->cot.cic);
-					isup_rel(ss7, e->cot.call, -1);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-
-				sig_ss7_lock_private(p);
-
-				if (p->loopedback) {
-					sig_ss7_loopback(p, 0);
-					ss7_start_call(p, linkset);
-				}
-
-				sig_ss7_unlock_private(p);
-
-				break;
-			case ISUP_EVENT_CCR:
-				ast_debug(1, "Got CCR request on CIC %d\n", e->ccr.cic);
-				chanpos = ss7_find_cic(linkset, e->ccr.cic, e->ccr.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "CCR on unconfigured CIC %d\n", e->ccr.cic);
-					break;
-				}
-
-				p = linkset->pvts[chanpos];
-
-				sig_ss7_lock_private(p);
-				sig_ss7_loopback(p, 1);
-				sig_ss7_unlock_private(p);
-
-				isup_lpa(linkset->ss7, e->ccr.cic, p->dpc);
-				break;
-			case ISUP_EVENT_CVT:
-				ast_debug(1, "Got CVT request on CIC %d\n", e->cvt.cic);
-				chanpos = ss7_find_cic(linkset, e->cvt.cic, e->cvt.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "CVT on unconfigured CIC %d\n", e->cvt.cic);
-					break;
-				}
-
-				p = linkset->pvts[chanpos];
-
-				sig_ss7_lock_private(p);
-				sig_ss7_loopback(p, 1);
-				sig_ss7_unlock_private(p);
-
-				isup_cvr(linkset->ss7, e->cvt.cic, p->dpc);
-				break;
-			case ISUP_EVENT_REL:
-				chanpos = ss7_find_cic(linkset, e->rel.cic, e->rel.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "REL on unconfigured CIC %d\n", e->rel.cic);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				sig_ss7_lock_private(p);
-				if (p->owner) {
-					p->owner->hangupcause = e->rel.cause;
-					p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-				} else {
-					ast_log(LOG_WARNING, "REL on channel (CIC %d) without owner!\n", p->cic);
-				}
-
-				/* End the loopback if we have one */
-				sig_ss7_loopback(p, 0);
-
-				isup_rlc(ss7, e->rel.call);
-				p->ss7call = NULL;
-
-				sig_ss7_unlock_private(p);
-				break;
-			case ISUP_EVENT_ACM:
-				chanpos = ss7_find_cic(linkset, e->acm.cic, e->acm.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "ACM on unconfigured CIC %d\n", e->acm.cic);
-					isup_rel(ss7, e->acm.call, -1);
-					break;
-				} else {
-					p = linkset->pvts[chanpos];
-
-					ast_debug(1, "Queueing frame from SS7_EVENT_ACM on CIC %d\n", p->cic);
-
-					if (e->acm.call_ref_ident > 0) {
-						p->rlt = 1; /* Setting it but not using it here*/
-					}
-
-					sig_ss7_lock_private(p);
-					sig_ss7_queue_control(linkset, chanpos, AST_CONTROL_PROCEEDING);
-					p->proceeding = 1;
-					sig_ss7_set_dialing(p, 0);
-					/* Send alerting if subscriber is free */
-					if (e->acm.called_party_status_ind == 1) {
-						p->alerting = 1;
-						sig_ss7_queue_control(linkset, chanpos, AST_CONTROL_RINGING);
-					}
-					sig_ss7_unlock_private(p);
-				}
-				break;
-			case ISUP_EVENT_CGB:
- 				chanpos = ss7_find_cic(linkset, e->cgb.startcic, e->cgb.opc);
- 				if (chanpos < 0) {
- 					ast_log(LOG_WARNING, "CGB on unconfigured CIC %d\n", e->cgb.startcic);
- 					break;
- 				}
- 				p = linkset->pvts[chanpos];
-				ss7_block_cics(linkset, e->cgb.startcic, e->cgb.endcic, e->cgb.opc, e->cgb.status, 1);
- 				isup_cgba(linkset->ss7, e->cgb.startcic, e->cgb.endcic, e->cgb.opc, e->cgb.status, e->cgb.type);
-				break;
-			case ISUP_EVENT_CGU:
- 				chanpos = ss7_find_cic(linkset, e->cgu.startcic, e->cgu.opc);
- 				if (chanpos < 0) {
- 					ast_log(LOG_WARNING, "CGU on unconfigured CIC %d\n", e->cgu.startcic);
- 					break;
- 				}
- 				p = linkset->pvts[chanpos];
-				ss7_block_cics(linkset, e->cgu.startcic, e->cgu.endcic, e->cgu.opc, e->cgu.status, 0);
- 				isup_cgua(linkset->ss7, e->cgu.startcic, e->cgu.endcic, e->cgu.opc, e->cgu.status, e->cgu.type);
-				break;
-			case ISUP_EVENT_UCIC:
-				chanpos = ss7_find_cic(linkset, e->ucic.cic, e->ucic.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "UCIC on unconfigured CIC %d\n", e->ucic.cic);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				ast_debug(1, "Unequiped Circuit Id Code on CIC %d\n", e->ucic.cic);
-				sig_ss7_lock_private(p);
-				sig_ss7_set_remotelyblocked(p, 1);
-				sig_ss7_set_inservice(p, 0);
-				sig_ss7_unlock_private(p);/* doesn't require a SS7 acknowledgement */
-				break;
-			case ISUP_EVENT_BLO:
-				chanpos = ss7_find_cic(linkset, e->blo.cic, e->blo.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "BLO on unconfigured CIC %d\n", e->blo.cic);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				ast_debug(1, "Blocking CIC %d\n", e->blo.cic);
-				sig_ss7_lock_private(p);
-				sig_ss7_set_remotelyblocked(p, 1);
-				sig_ss7_unlock_private(p);
-				isup_bla(linkset->ss7, e->blo.cic, p->dpc);
-				break;
-			case ISUP_EVENT_BLA:
-				chanpos = ss7_find_cic(linkset, e->bla.cic, e->bla.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "BLA on unconfigured CIC %d\n", e->bla.cic);
-					break;
-				}
-				ast_debug(1, "Blocking CIC %d\n", e->bla.cic);
-				p = linkset->pvts[chanpos];
-				sig_ss7_lock_private(p);
-				sig_ss7_set_locallyblocked(p, 1);
-				sig_ss7_unlock_private(p);
-				break;
-			case ISUP_EVENT_UBL:
-				chanpos = ss7_find_cic(linkset, e->ubl.cic, e->ubl.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "UBL on unconfigured CIC %d\n", e->ubl.cic);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				ast_debug(1, "Unblocking CIC %d\n", e->ubl.cic);
-				sig_ss7_lock_private(p);
-				sig_ss7_set_remotelyblocked(p, 0);
-				sig_ss7_unlock_private(p);
-				isup_uba(linkset->ss7, e->ubl.cic, p->dpc);
-				break;
-			case ISUP_EVENT_UBA:
-				chanpos = ss7_find_cic(linkset, e->uba.cic, e->uba.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "UBA on unconfigured CIC %d\n", e->uba.cic);
-					break;
-				}
-				p = linkset->pvts[chanpos];
-				ast_debug(1, "Unblocking CIC %d\n", e->uba.cic);
-				sig_ss7_lock_private(p);
-				sig_ss7_set_locallyblocked(p, 0);
-				sig_ss7_unlock_private(p);
-				break;
-			case ISUP_EVENT_CON:
-			case ISUP_EVENT_ANM:
-				if (e->e == ISUP_EVENT_CON)
-					cic = e->con.cic;
-				else
-					cic = e->anm.cic;
-
-				chanpos = ss7_find_cic(linkset, cic, (e->e == ISUP_EVENT_ANM) ? e->anm.opc : e->con.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "ANM/CON on unconfigured CIC %d\n", cic);
-					isup_rel(ss7, (e->e == ISUP_EVENT_ANM) ? e->anm.call : e->con.call, -1);
-					break;
-				} else {
-					p = linkset->pvts[chanpos];
-					sig_ss7_lock_private(p);
-					sig_ss7_queue_control(linkset, chanpos, AST_CONTROL_ANSWER);
-#if 0/* sig_pri seems to have just deleted this code. */
-/* BUGBUG dsp, dsp_features need equivalent. what done in sig_pri? */
-					if (p->dsp && p->dsp_features) {
-						ast_dsp_set_features(p->dsp, p->dsp_features);
-						p->dsp_features = 0;
-					}
-#endif
-					sig_ss7_set_echocanceller(p, 1);
-					sig_ss7_unlock_private(p);
-				}
-				break;
-			case ISUP_EVENT_RLC:
-				chanpos = ss7_find_cic(linkset, e->rlc.cic, e->rlc.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "RLC on unconfigured CIC %d\n", e->rlc.cic);
-					break;
-				} else {
-					p = linkset->pvts[chanpos];
-					sig_ss7_lock_private(p);
-					if (p->alreadyhungup)
-						p->ss7call = NULL;
-					else
-						ast_log(LOG_NOTICE, "Received RLC out and we haven't sent REL.  Ignoring.\n");
-					sig_ss7_unlock_private(p);
-					}
-					break;
-			case ISUP_EVENT_FAA:
-				chanpos = ss7_find_cic(linkset, e->faa.cic, e->faa.opc);
-				if (chanpos < 0) {
-					ast_log(LOG_WARNING, "FAA on unconfigured CIC %d\n", e->faa.cic);
-					break;
-				} else {
-					p = linkset->pvts[chanpos];
-					ast_debug(1, "FAA received on CIC %d\n", e->faa.cic);
-					sig_ss7_lock_private(p);
-					if (p->alreadyhungup){
-						p->ss7call = NULL;
-						ast_log(LOG_NOTICE, "Received FAA and we haven't sent FAR.  Ignoring.\n");
-					}
-					sig_ss7_unlock_private(p);
-				}
-				break;
-			default:
-				ast_debug(1, "Unknown event %s\n", ss7_event2str(e->e));
-				break;
-			}
-		}
-		ast_mutex_unlock(&linkset->lock);
-	}
-
-	return 0;
-}
-#endif	/* defined(HAVE_SS7) */
 
 #if defined(HAVE_SS7)
 static void dahdi_ss7_message(struct ss7 *ss7, char *s)
@@ -18311,495 +17210,6 @@
 	}
 	return 0;
 }
-/* BUGBUG sig_ss7 API functions ----v*/
-
-/*!
- * \brief Notify the SS7 layer that the link is in alarm.
- * \since 1.8
- *
- * \param linkset Controlling linkset for the channel.
- * \param which Link index of the signaling channel.
- *
- * \return Nothing
- */
-void sig_ss7_link_alarm(struct sig_ss7_linkset *linkset, int which)
-{
-	linkset->linkstate[which] |= (LINKSTATE_DOWN | LINKSTATE_INALARM);
-	linkset->linkstate[which] &= ~LINKSTATE_UP;
-	ss7_link_alarm(linkset->ss7, linkset->fds[which]);
-}
-
-/*!
- * \brief Notify the SS7 layer that the link is no longer in alarm.
- * \since 1.8
- *
- * \param linkset Controlling linkset for the channel.
- * \param which Link index of the signaling channel.
- *
- * \return Nothing
- */
-void sig_ss7_link_noalarm(struct sig_ss7_linkset *linkset, int which)
-{
-	linkset->linkstate[which] &= ~(LINKSTATE_INALARM | LINKSTATE_DOWN);
-	linkset->linkstate[which] |= LINKSTATE_STARTING;
-	ss7_link_noalarm(linkset->ss7, linkset->fds[which]);
-}
-
-/*!
- * \brief Setup and add a SS7 link channel.
- * \since 1.8
- *
- * \param linkset Controlling linkset for the channel.
- * \param which Link index of the signaling channel.
- * \param ss7type Switch type of the linkset
- * \param transport Signaling transport of channel.
- * \param inalarm Non-zero if the channel is in alarm.
- * \param networkindicator User configuration parameter.
- * \param pointcode User configuration parameter.
- * \param adjpointcode User configuration parameter.
- *
- * \retval 0 on success.
- * \retval -1 on error.
- */
-int sig_ss7_add_sigchan(struct sig_ss7_linkset *linkset, int which, int ss7type, int transport, int inalarm, int networkindicator, int pointcode, int adjpointcode)
-{
-	if (!linkset->ss7) {
-		linkset->type = ss7type;
-		linkset->ss7 = ss7_new(ss7type);
-		if (!linkset->ss7) {
-			ast_log(LOG_ERROR, "Can't create new SS7!\n");
-			return -1;
-		}
-	}
-
-	ss7_set_network_ind(linkset->ss7, networkindicator);
-	ss7_set_pc(linkset->ss7, pointcode);
-
-	if (ss7_add_link(linkset->ss7, transport, linkset->fds[which])) {
-		ast_log(LOG_WARNING, "Could not add SS7 link!\n");
-	}
-
-	if (inalarm) {
-		linkset->linkstate[which] = LINKSTATE_DOWN | LINKSTATE_INALARM;
-		ss7_link_alarm(linkset->ss7, linkset->fds[which]);
-	} else {
-		linkset->linkstate[which] = LINKSTATE_DOWN;
-		ss7_link_noalarm(linkset->ss7, linkset->fds[which]);
-	}
-
-	ss7_set_adjpc(linkset->ss7, linkset->fds[which], adjpointcode);
-
-	return 0;
-}
-
-/*!
- * \brief Determine if the specified channel is available for an outgoing call.
- * \since 1.8
- *
- * \param p Signaling private structure pointer.
- *
- * \retval TRUE if the channel is available.
- */
-int sig_ss7_available(struct sig_ss7_chan *p)
-{
-	if (!p->ss7) {
-		/* Something is wrong here.  A SS7 channel without the ss7 pointer? */
-		return 0;
-	}
-
-	if (!p->inalarm && !p->owner && !p->ss7call
-		&& !p->locallyblocked && !p->remotelyblocked) {
-		return 1;
-	}
-
-	return 0;
-}
-
-/*!
- * \brief Dial out using the specified SS7 channel.
- * \since 1.8
- *
- * \param p Signaling private structure pointer.
- * \param ast Asterisk channel structure pointer.
- * \param rdest Dialstring.
- *
- * \retval 0 on success.
- * \retval -1 on error.
- */
-int sig_ss7_call(struct sig_ss7_chan *p, struct ast_channel *ast, char *rdest)
-{
-	char ss7_called_nai;
-	int called_nai_strip;
-	char ss7_calling_nai;
-	int calling_nai_strip;
-	const char *charge_str = NULL;
-	const char *gen_address = NULL;
-	const char *gen_digits = NULL;
-	const char *gen_dig_type = NULL;
-	const char *gen_dig_scheme = NULL;
-	const char *gen_name = NULL;
-	const char *jip_digits = NULL;
-	const char *lspi_ident = NULL;
-	const char *rlt_flag = NULL;
-	const char *call_ref_id = NULL;
-	const char *call_ref_pc = NULL;
-	const char *send_far = NULL;
-	char *c;
-	char *l;
-	char dest[256];
-
-	ast_copy_string(dest, rdest, sizeof(dest));
-
-	c = strchr(dest, '/');
-	if (c) {
-		c++;
-	} else {
-		c = "";
-	}
-	if (strlen(c) < p->stripmsd) {
-		ast_log(LOG_WARNING, "Number '%s' is shorter than stripmsd (%d)\n", c, p->stripmsd);
-		return -1;
-	}
-
-	if (!p->hidecallerid) {
-		l = ast->connected.id.number;
-	} else {
-		l = NULL;
-	}
-
-	if (ss7_grab(p, p->ss7)) {
-		ast_log(LOG_WARNING, "Failed to grab SS7!\n");
-		return -1;
-	}
-
-	p->ss7call = isup_new_call(p->ss7->ss7);
-	if (!p->ss7call) {
-		ss7_rel(p->ss7);
-		ast_log(LOG_ERROR, "Unable to allocate new SS7 call!\n");
-		return -1;
-	}
-
-	called_nai_strip = 0;
-	ss7_called_nai = p->ss7->called_nai;
-	if (ss7_called_nai == SS7_NAI_DYNAMIC) { /* compute dynamically */
-		if (strncmp(c + p->stripmsd, p->ss7->internationalprefix, strlen(p->ss7->internationalprefix)) == 0) {
-			called_nai_strip = strlen(p->ss7->internationalprefix);

[... 1908 lines stripped ...]



More information about the svn-commits mailing list