[Pkg-voip-commits] r5795 - in /asterisk/trunk/debian/patches/bristuff: ast-device-state-CID ast-send-message isdn-fixes uniqueid-10-channel-ops-uniqueid uniqueid-30-app-chanspy uniqueid-40-manager zapata-bri+euroisdn zapata-gsm zapata_euroisdn_holded

paravoid at alioth.debian.org paravoid at alioth.debian.org
Sun May 25 20:38:06 UTC 2008 

Author: paravoid
Date: Sun May 25 20:38:06 2008
New Revision: 5795

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5795
Log:
Do a quilt refresh on all patches

Modified:
    asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
    asterisk/trunk/debian/patches/bristuff/ast-send-message
    asterisk/trunk/debian/patches/bristuff/isdn-fixes
    asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
    asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy
    asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager
    asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
    asterisk/trunk/debian/patches/bristuff/zapata-gsm
    asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded

Modified: asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-device-state-CID?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Sun May 25 20:38:06 2008
@@ -120,7 +120,7 @@
  		} else {
 --- a/include/asterisk/channel.h
 +++ b/include/asterisk/channel.h
-@@ -608,8 +608,13 @@ int ast_channel_datastore_remove(struct 
+@@ -611,8 +611,13 @@ int ast_channel_datastore_remove(struct 
  /*! \brief Find a datastore on a channel */
  struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const struct ast_datastore_info *info, char *uid);
  
@@ -146,7 +146,7 @@
  }
  
  struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, char *uid)
-@@ -3634,7 +3634,7 @@ void ast_set_callerid(struct ast_channel
+@@ -3647,7 +3647,7 @@ void ast_set_callerid(struct ast_channel
  	ast_channel_unlock(chan);
  }
  
@@ -155,7 +155,7 @@
  {
  	int oldstate = chan->_state;
  
-@@ -3642,7 +3642,7 @@ int ast_setstate(struct ast_channel *cha
+@@ -3655,7 +3655,7 @@ int ast_setstate(struct ast_channel *cha
  		return 0;
  
  	chan->_state = state;
@@ -164,7 +164,7 @@
  	/* setstate used to conditionally report Newchannel; this is no more */
  	manager_event(EVENT_FLAG_CALL,
  		      "Newstate",
-@@ -3659,6 +3659,11 @@ int ast_setstate(struct ast_channel *cha
+@@ -3672,6 +3672,11 @@ int ast_setstate(struct ast_channel *cha
  	return 0;
  }
  

Modified: asterisk/trunk/debian/patches/bristuff/ast-send-message
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-send-message?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Sun May 25 20:38:06 2008
@@ -69,7 +69,7 @@
  int ast_senddigit_begin(struct ast_channel *chan, char digit)
  {
  	/* Device does not support DTMF tones, lets fake
-@@ -4487,6 +4500,25 @@ void ast_channel_stop_silence_generator(
+@@ -4491,6 +4504,25 @@ void ast_channel_stop_silence_generator(
  }
  
  

Modified: asterisk/trunk/debian/patches/bristuff/isdn-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/isdn-fixes?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/isdn-fixes (original)
+++ asterisk/trunk/debian/patches/bristuff/isdn-fixes Sun May 25 20:38:06 2008
@@ -11,7 +11,7 @@
  			/* Restore saved values */
 --- a/main/channel.c
 +++ b/main/channel.c
-@@ -3925,6 +3925,10 @@ enum ast_bridge_result ast_channel_bridg
+@@ -3874,6 +3874,10 @@ enum ast_bridge_result ast_channel_bridg
  			c1->name, c1->_bridge->name);
  		return -1;
  	}

Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-10-channel-ops-uniqueid Sun May 25 20:38:06 2008
@@ -1,8 +1,8 @@
 Add or convert channel operations so they can use the unique ID.
 
---- asterisk.orig/include/asterisk/channel.h
-+++ asterisk/include/asterisk/channel.h
-@@ -677,6 +677,18 @@ void  ast_channel_free(struct ast_channe
+--- a/include/asterisk/channel.h
++++ b/include/asterisk/channel.h
+@@ -680,6 +680,18 @@ void  ast_channel_free(struct ast_channe
   */
  struct ast_channel *ast_request(const char *type, int format, void *data, int *status);
  
@@ -21,7 +21,7 @@
  /*!
   * \brief Request a channel of a given type, with data as optional information used 
   * by the low level module and attempt to place a call on it
-@@ -692,8 +704,12 @@ struct ast_channel *ast_request(const ch
+@@ -695,8 +707,12 @@ struct ast_channel *ast_request(const ch
   */
  struct ast_channel *ast_request_and_dial(const char *type, int format, void *data, int timeout, int *reason, const char *cidnum, const char *cidname);
  
@@ -34,7 +34,7 @@
  /*! \brief "Requests" a channel for sending a message
   * \param type type of channel to request
   * \param data data to pass to the channel requester
-@@ -977,6 +993,8 @@ struct ast_channel *ast_get_channel_by_e
+@@ -988,6 +1004,8 @@ struct ast_channel *ast_get_channel_by_e
  /*! \brief Get next channel by exten (and optionally context) and lock it */
  struct ast_channel *ast_walk_channel_by_exten_locked(const struct ast_channel *chan, const char *exten,
  						     const char *context);
@@ -43,8 +43,8 @@
  
  /*! ! \brief Waits for a digit
   * \param c channel to wait for a digit on
---- asterisk.orig/main/channel.c
-+++ asterisk/main/channel.c
+--- a/main/channel.c
++++ b/main/channel.c
 @@ -1017,7 +1017,7 @@ void ast_channel_undefer_dtmf(struct ast
   */
  static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
@@ -130,7 +130,7 @@
  	int dummy_outstate;
  	int cause = 0;
  	struct ast_channel *chan;
-@@ -2834,7 +2850,7 @@ struct ast_channel *__ast_request_and_di
+@@ -2847,7 +2861,7 @@ struct ast_channel *__ast_request_and_di
  	else
  		outstate = &dummy_outstate;	/* make outstate always a valid pointer */
  
@@ -173,8 +173,8 @@
  int ast_call(struct ast_channel *chan, char *addr, int timeout)
  {
  	/* Place an outgoing call, but don't wait any longer than timeout ms before returning.
---- asterisk.orig/include/asterisk/pbx.h
-+++ asterisk/include/asterisk/pbx.h
+--- a/include/asterisk/pbx.h
++++ b/include/asterisk/pbx.h
 @@ -717,9 +717,17 @@ int ast_async_goto_by_name(const char *c
  int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout, const char *context, const char *exten, int priority, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel);
  
@@ -193,8 +193,8 @@
  /*!
   * \brief Evaluate a condition
   *
---- asterisk.orig/main/pbx.c
-+++ asterisk/main/pbx.c
+--- a/main/pbx.c
++++ b/main/pbx.c
 @@ -4990,7 +4990,7 @@ static int ast_pbx_outgoing_cdr_failed(v
  	return 0;  /* success */
  }

Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy Sun May 25 20:38:06 2008
@@ -45,7 +45,7 @@
  {
  	struct ast_channel *this;
  
-@@ -466,6 +489,8 @@ redo:
+@@ -466,6 +488,8 @@ redo:
  		this = ast_walk_channel_by_name_prefix_locked(last, spec, strlen(spec));
  	else if (exten)
  		this = ast_walk_channel_by_exten_locked(last, exten, context);
@@ -54,7 +54,7 @@
  	else
  		this = ast_channel_walk_locked(last);
  
-@@ -486,7 +511,7 @@ redo:
+@@ -486,7 +510,7 @@ redo:
  
  static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
  		       int volfactor, const int fd, const char *mygroup, const char *spec,
@@ -63,7 +63,7 @@
  {
  	char nameprefix[AST_NAME_STRLEN];
  	char peer_name[AST_NAME_STRLEN + 5];
-@@ -531,11 +556,11 @@ static int common_exec(struct ast_channe
+@@ -531,11 +555,11 @@ static int common_exec(struct ast_channe
  		waitms = 100;
  		num_spyed_upon = 0;
  
@@ -77,7 +77,7 @@
  			const char *group;
  			int igrp = !mygroup;
  			char *groups[25];
-@@ -737,7 +762,7 @@ static int chanspy_exec(struct ast_chann
+@@ -737,7 +761,7 @@ static int chanspy_exec(struct ast_chann
  		}
  	}
  
@@ -86,7 +86,7 @@
  
  	if (fd)
  		close(fd);
-@@ -822,7 +847,92 @@ static int extenspy_exec(struct ast_chan
+@@ -822,7 +846,92 @@ static int extenspy_exec(struct ast_chan
  		}
  	}
  
@@ -180,7 +180,7 @@
  
  	if (fd)
  		close(fd);
-@@ -835,14 +945,15 @@ static int extenspy_exec(struct ast_chan
+@@ -835,14 +944,15 @@ static int extenspy_exec(struct ast_chan
  	return res;
  }
  
@@ -197,7 +197,7 @@
  
  	return res;
  }
-@@ -853,6 +964,7 @@ static int load_module(void)
+@@ -853,6 +963,7 @@ static int load_module(void)
  
  	res |= ast_register_application(app_chan, chanspy_exec, tdesc, desc_chan);
  	res |= ast_register_application(app_ext, extenspy_exec, tdesc, desc_ext);

Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-40-manager Sun May 25 20:38:06 2008
@@ -1,5 +1,5 @@
---- asterisk.orig/main/manager.c
-+++ asterisk/main/manager.c
+--- a/main/manager.c
++++ b/main/manager.c
 @@ -87,6 +87,8 @@ struct fast_originate_helper {
  	char idtext[AST_MAX_EXTENSION];
  	char account[AST_MAX_ACCOUNT_CODE];
@@ -54,7 +54,7 @@
  		return 0;
  	}
  	if (!ast_strlen_zero(priority) && (sscanf(priority, "%d", &pi) != 1)) {
-@@ -1683,8 +1700,18 @@ static int action_redirect(struct manses
+@@ -1684,8 +1701,18 @@ static int action_redirect(struct manses
  			return 0;
  		}
  	}
@@ -99,7 +99,7 @@
  			else
  				res = -1;
  			if (!res)
-@@ -1788,15 +1809,15 @@ static void *fast_originate(void *data)
+@@ -1788,15 +1818,15 @@ static void *fast_originate(void *data)
  	char requested_channel[AST_CHANNEL_NAME];
  
  	if (!ast_strlen_zero(in->app)) {
@@ -119,7 +119,7 @@
  	}
  
  	if (!chan)
-@@ -1856,6 +1877,7 @@ static int action_originate(struct manse
+@@ -1856,6 +1886,7 @@ static int action_originate(struct manse
  	const char *appdata = astman_get_header(m, "Data");
  	const char *async = astman_get_header(m, "Async");
  	const char *id = astman_get_header(m, "ActionID");
@@ -127,7 +127,7 @@
  	struct ast_variable *vars = astman_get_variables(m);
  	char *tech, *data;
  	char *l = NULL, *n = NULL;
-@@ -1865,6 +1887,9 @@ static int action_originate(struct manse
+@@ -1865,6 +1896,9 @@ static int action_originate(struct manse
  	int reason = 0;
  	char tmp[256];
  	char tmp2[256];
@@ -137,7 +137,7 @@
  	
  	pthread_t th;
  	pthread_attr_t attr;
-@@ -1882,6 +1907,10 @@ static int action_originate(struct manse
+@@ -1882,6 +1916,10 @@ static int action_originate(struct manse
  		astman_send_error(s, m, "Invalid timeout\n");
  		return 0;
  	}
@@ -148,7 +148,7 @@
  	ast_copy_string(tmp, name, sizeof(tmp));
  	tech = tmp;
  	data = strchr(tmp, '/');
-@@ -1901,6 +1930,7 @@ static int action_originate(struct manse
+@@ -1901,6 +1939,7 @@ static int action_originate(struct manse
  		if (ast_strlen_zero(l))
  			l = NULL;
  	}
@@ -156,7 +156,7 @@
  	if (ast_true(async)) {
  		struct fast_originate_helper *fast = ast_calloc(1, sizeof(*fast));
  		if (!fast) {
-@@ -1920,8 +1950,10 @@ static int action_originate(struct manse
+@@ -1920,8 +1959,10 @@ static int action_originate(struct manse
  			ast_copy_string(fast->context, context, sizeof(fast->context));
  			ast_copy_string(fast->exten, exten, sizeof(fast->exten));
  			ast_copy_string(fast->account, account, sizeof(fast->account));
@@ -167,7 +167,7 @@
  			pthread_attr_init(&attr);
  			pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
  			if (ast_pthread_create(&th, &attr, fast_originate, fast)) {
-@@ -1932,19 +1964,28 @@ static int action_originate(struct manse
+@@ -1932,19 +1973,28 @@ static int action_originate(struct manse
  			pthread_attr_destroy(&attr);
  		}
  	} else if (!ast_strlen_zero(app)) {
@@ -201,8 +201,8 @@
  	return 0;
  }
  
---- asterisk.orig/include/asterisk/channel.h
-+++ asterisk/include/asterisk/channel.h
+--- a/include/asterisk/channel.h
++++ b/include/asterisk/channel.h
 @@ -89,6 +89,9 @@
  
  #include "asterisk/abstract_jb.h"
@@ -213,7 +213,7 @@
  #include <unistd.h>
  #ifdef POLLCOMPAT 
  #include "asterisk/poll-compat.h"
-@@ -1026,6 +1029,8 @@ int ast_waitfordigit_full(struct ast_cha
+@@ -1037,6 +1040,8 @@ int ast_waitfordigit_full(struct ast_cha
  int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders);
  int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, int rtimeout, char *enders, int audiofd, int ctrlfd);
  
@@ -222,8 +222,8 @@
  /*! \brief Report DTMF on channel 0 */
  #define AST_BRIDGE_DTMF_CHANNEL_0		(1 << 0)		
  /*! \brief Report DTMF on channel 1 */
---- asterisk.orig/main/channel.c
-+++ asterisk/main/channel.c
+--- a/main/channel.c
++++ b/main/channel.c
 @@ -706,6 +706,15 @@ static const struct ast_channel_tech nul
  	.description = "Null channel (should not see this)",
  };

Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Sun May 25 20:38:06 2008
@@ -669,16 +669,10 @@
  				old->owner = NULL;
  				if (new->owner) {
  					ast_string_field_build(new->owner, name, 
-@@ -8091,11 +8253,39 @@ static int pri_fixup_principle(struct zt
- 				old->call = NULL;
- 
- 				/* Copy any DSP that may be present */
--				new->dsp = old->dsp;
-+				new->dsp = old->dsp;
+@@ -8095,6 +8257,34 @@ static int pri_fixup_principle(struct zt
  				new->dsp_features = old->dsp_features;
  				old->dsp = NULL;
  				old->dsp_features = 0;
--			}
 +
 +				/* Copy faxhandled/digial, alreadyhungup */
 +				new->faxhandled = old->faxhandled;
@@ -707,10 +701,9 @@
 +				restore_gains(old);
 +				zt_disable_ec(old);
 +				zt_setlinear(old->subs[SUB_REAL].zfd, 0);
-+			}
+ 			}
  			return principle;
  		}
- 	}
 @@ -8123,7 +8313,9 @@ static int pri_fixup_principle(struct zt
  		}
  		crv = crv->next;
@@ -912,7 +905,7 @@
  		if (e) {
  			if (pri->debug)
  				pri_dump_event(pri->dchans[which], e);
-@@ -8577,41 +8749,60 @@ static void *pri_dchannel(void *vpri)
+@@ -8577,6 +8749,17 @@ static void *pri_dchannel(void *vpri)
  
  			switch (e->e) {
  			case PRI_EVENT_DCHAN_UP:
@@ -930,33 +923,20 @@
  				if (!pri->pri) pri_find_dchan(pri);
  
  				/* Note presense of D-channel */
- 				time(&pri->lastreset);
- 
- 				/* Restart in 5 seconds */
- 				if (pri->resetinterval > -1) {
- 					pri->lastreset -= pri->resetinterval;
- 					pri->lastreset += 5;
- 				}
- 				pri->resetting = 0;
- 				/* Take the channels from inalarm condition */
- 				for (i = 0; i < pri->numchans; i++)
- 					if (pri->pvts[i]) {
- 						pri->pvts[i]->inalarm = 0;
+@@ -8595,6 +8778,12 @@ static void *pri_dchannel(void *vpri)
  					}
  				break;
  			case PRI_EVENT_DCHAN_DOWN:
--				pri_find_dchan(pri);
--				if (!pri_is_up(pri)) {
 +				if (pri->nodetype == BRI_NETWORK_PTMP) {
 +  				    if (option_verbose > 3)
 +  					ast_verbose(VERBOSE_PREFIX_2 "%s D-Channel on span %d down for TEI %d\n", pri_order(which), pri->span, e->gen.tei);
 +  				    // PTMP BRIs have N dchans, handled by libpri
 +  				    if (e->gen.tei == 0) break;
 +				}
-+				pri_find_dchan(pri);
-+				if (!pri_is_up(pri)) {
+ 				pri_find_dchan(pri);
+ 				if (!pri_is_up(pri)) {
  					pri->resetting = 0;
- 					/* Hangup active channels and put them in alarm mode */
+@@ -8602,16 +8791,18 @@ static void *pri_dchannel(void *vpri)
  					for (i = 0; i < pri->numchans; i++) {
  						struct zt_pvt *p = pri->pvts[i];
  						if (p) {

Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Sun May 25 20:38:06 2008
@@ -163,7 +163,7 @@
  	case 0:
  		ast_mutex_unlock(&p->lock);
  		return 0;
-@@ -7297,6 +7356,10 @@ static int pri_create_spanmap(int span, 
+@@ -7303,6 +7362,10 @@ static int pri_create_spanmap(int span, 
  
  #endif
  
@@ -174,7 +174,7 @@
  static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pri *pri, int reloading)
  {
  	/* Make a zt_pvt structure for this interface (or CRV if "pri" is specified) */
-@@ -7525,6 +7588,37 @@ static struct zt_pvt *mkintf(int channel
+@@ -7531,6 +7594,37 @@ static struct zt_pvt *mkintf(int channel
  				tmp->prioffset = 0;
  			}
  #endif
@@ -212,7 +212,7 @@
  		} else {
  			conf.chan.sig = tmp->sig;
  			conf.chan.radio = tmp->radio;
-@@ -7814,6 +7908,12 @@ static inline int available(struct zt_pv
+@@ -7820,6 +7914,12 @@ static inline int available(struct zt_pv
  				return 1;
  		}
  #endif
@@ -225,7 +225,7 @@
  		if (!(p->radio || (p->oprmode < 0)))
  		{
  			if (!p->sig || (p->sig == SIG_FXSLS))
-@@ -8171,6 +8271,235 @@ next:
+@@ -8177,6 +8277,235 @@ next:
  	return tmp;
  }
  
@@ -461,7 +461,7 @@
  #ifdef HAVE_PRI
  static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
  {
-@@ -8450,6 +8779,18 @@ static void zt_pri_error(char *s, int sp
+@@ -8451,6 +8780,18 @@ static void zt_pri_error(char *s, int sp
  	ast_log(LOG_WARNING, "%d %s", span, s);
  }
  
@@ -480,7 +480,7 @@
  static int pri_check_restart(struct zt_pri *pri)
  {
  	if ((pri->nodetype != PRI_NETWORK) && (pri->nodetype != PRI_CPE)) {
-@@ -10887,6 +11228,243 @@ static int app_zapInband(struct ast_chan
+@@ -10857,6 +11198,243 @@ static int app_zapInband(struct ast_chan
  
  #endif /* HAVE_PRI */
  
@@ -724,7 +724,7 @@
  static int app_zapEC(struct ast_channel *chan, void *data)
  {
   int res=-1;
-@@ -11508,6 +12086,12 @@ static int __unload_module(void)
+@@ -11478,6 +12056,12 @@ static int __unload_module(void)
  	ast_unregister_application(zapCD_app);
  	ast_unregister_application(zapInband_app);
  #endif
@@ -737,7 +737,7 @@
  	ast_cli_unregister_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
  	ast_unregister_application(zapEC_app);
  	ast_manager_unregister( "ZapDialOffhook" );
-@@ -12028,6 +12612,11 @@ static int process_zap(struct zt_chan_co
+@@ -11998,6 +12582,11 @@ static int process_zap(struct zt_chan_co
   					confp->chan.radio = 0;
   					confp->pri.nodetype = BRI_CPE;
  #endif
@@ -749,7 +749,7 @@
  				} else {
  					ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
  				}
-@@ -12170,6 +12759,10 @@ static int process_zap(struct zt_chan_co
+@@ -12140,6 +12729,10 @@ static int process_zap(struct zt_chan_co
    				ast_copy_string(confp->pri.nocid, v->value, sizeof(confp->pri.nocid));
    			} else if (!strcasecmp(v->name, "withheldcid")) {
    				ast_copy_string(confp->pri.withheldcid, v->value, sizeof(confp->pri.withheldcid));
@@ -760,7 +760,7 @@
  			} else if (!strcasecmp(v->name, "resetinterval")) {
  				if (!strcasecmp(v->value, "never"))
  					confp->pri.resetinterval = -1;
-@@ -12524,6 +13117,10 @@ static int load_module(void)
+@@ -12494,6 +13087,10 @@ static int load_module(void)
  	ast_register_application(zap_send_keypad_facility_app, zap_send_keypad_facility_exec,
  			zap_send_keypad_facility_synopsis, zap_send_keypad_facility_descrip);
  #endif
@@ -771,7 +771,7 @@
  	res = setup_zap(0);
  	/* Make sure we can register our Zap channel type */
  	if (res)
-@@ -12542,6 +13139,12 @@ static int load_module(void)
+@@ -12512,6 +13109,12 @@ static int load_module(void)
  #endif	
  	ast_register_application(zapEC_app, app_zapEC, zapEC_synopsis, zapEC_tdesc);
  	ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
@@ -784,7 +784,7 @@
  	
  	memset(round_robin, 0, sizeof(round_robin));
  	ast_manager_register( "ZapTransfer", 0, action_transfer, "Transfer Zap Channel" );
-@@ -12555,7 +13158,66 @@ static int load_module(void)
+@@ -12525,7 +13128,66 @@ static int load_module(void)
  	return res;
  }
  

Modified: asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded?rev=5795&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded Sun May 25 20:38:06 2008
@@ -50,7 +50,7 @@
  	int debugfd;
  };
  
-@@ -7485,6 +7499,7 @@ static struct zt_pvt *mkintf(int channel
+@@ -7491,6 +7505,7 @@ static struct zt_pvt *mkintf(int channel
  						pris[span].overlapdial = conf.pri.overlapdial;
  						pris[span].usercid = conf.pri.usercid;
  						pris[span].suspended_calls = NULL;
@@ -58,7 +58,7 @@
  						pris[span].facilityenable = conf.pri.facilityenable;
  						ast_copy_string(pris[span].idledial, conf.pri.idledial, sizeof(pris[span].idledial));
  						ast_copy_string(pris[span].idleext, conf.pri.idleext, sizeof(pris[span].idleext));
-@@ -8169,6 +8184,58 @@ static struct zt_pvt *pri_find_crv(struc
+@@ -8175,6 +8190,58 @@ static struct zt_pvt *pri_find_crv(struc
  	return NULL;
  }
  
@@ -117,7 +117,7 @@
  
  static int pri_find_principle(struct zt_pri *pri, int channel)
  {
-@@ -9620,18 +9687,150 @@ static void *pri_dchannel(void *vpri)
+@@ -9590,18 +9657,150 @@ static void *pri_dchannel(void *vpri)
  				    pri_hold_reject(pri->pri, e->hold_req.call);
  				    break;
  				}
@@ -274,7 +274,7 @@
  			case PRI_EVENT_DISPLAY_RECEIVED:
  				ast_log(LOG_NOTICE, "DISPLAY IE: [ %s ] received\n",e->display.text);
  				chanpos = pri_find_principle(pri, e->display.channel);
-@@ -9788,9 +9987,20 @@ static void *pri_dchannel(void *vpri)
+@@ -9758,9 +9957,20 @@ static void *pri_dchannel(void *vpri)
  
  						ast_mutex_unlock(&pri->pvts[chanpos]->lock);
  					} else {
@@ -298,7 +298,7 @@
  					}
  				} 
  				break;
-@@ -9853,11 +10063,63 @@ static void *pri_dchannel(void *vpri)
+@@ -9823,11 +10033,63 @@ static void *pri_dchannel(void *vpri)
  							    	ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n",
  									pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, (int)e->hangup.aoc_units, (e->hangup.aoc_units == 1) ? "" : "s");
  							}
@@ -367,7 +367,7 @@
  						} else {
  							pri_hangup(pri->pri, pri->pvts[chanpos]->call, e->hangup.cause, -1);
  							pri->pvts[chanpos]->call = NULL;
-@@ -9887,7 +10149,19 @@ static void *pri_dchannel(void *vpri)
+@@ -9857,7 +10119,19 @@ static void *pri_dchannel(void *vpri)
   						if (pri->nodetype != BRI_NETWORK_PTMP) {
    						    ast_log(LOG_WARNING, "Hangup REQ on bad channel %d/%d on span %d\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span);
   						} else {
@@ -388,7 +388,7 @@
   						}
  					}
  				} 
-@@ -10047,16 +10321,73 @@ static void *pri_dchannel(void *vpri)
+@@ -10017,16 +10291,73 @@ static void *pri_dchannel(void *vpri)
  				}
  				break;
   			case PRI_EVENT_FACILITY:

More information about the Pkg-voip-commits mailing list