patches: Rebase rtoutpulsing and blueboxing patches.

Rebase rtoutpulsing patches against current master, to
fix compilation failure following asterisk/asterisk@fe7be89
and asterisk/asterisk@dc8e3ee

Author: InterLinked1

patches/.ast_rtoutpulsing_channels.diff.swp

@@ -2,28 +2,26 @@ diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
 index 3baabb0872..81feb3ad0b 100644
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -1050,6 +1050,7 @@ static struct dahdi_chan_conf dahdi_chan_conf_default(void)
+@@ -1050,4 +1050,5 @@ static struct dahdi_chan_conf dahdi_chan_conf_default(void)
  			.mohsuggest = "",
  			.parkinglot = "",
  			.transfertobusy = 1,
 +			.realtimepulsing = 0,
- 			.dialmode = 0,
- 
- 			.ani_info_digits = 2,
+ 			.permdialmode = ANALOG_DIALMODE_BOTH,
 @@ -12958,6 +12959,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
  		tmp->immediate = conf->chan.immediate;
  		tmp->immediatering = conf->chan.immediatering;
  		tmp->transfertobusy = conf->chan.transfertobusy;
 +		tmp->realtimepulsing = conf->chan.realtimepulsing;
- 		tmp->dialmode = conf->chan.dialmode;
+ 		tmp->permdialmode = conf->chan.permdialmode;
  		if (chan_sig & __DAHDI_SIG_FXS) {
  			tmp->mwimonitor_fsk = conf->chan.mwimonitor_fsk;
 @@ -13298,6 +13300,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
  				analog_p->threewaycalling = conf->chan.threewaycalling;
  				analog_p->transfer = conf->chan.transfer;
  				analog_p->transfertobusy = conf->chan.transfertobusy;
 +				analog_p->realtimepulsing = conf->chan.realtimepulsing;
- 				analog_p->dialmode = conf->chan.dialmode;
+ 				analog_p->permdialmode = conf->chan.permdialmode;
  				analog_p->use_callerid = tmp->use_callerid;
  				analog_p->usedistinctiveringdetection = tmp->usedistinctiveringdetection;
 @@ -18588,6 +18591,8 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
@@ -34,4 +32,4 @@ index 3baabb0872..81feb3ad0b 100644
 +			confp->chan.realtimepulsing = ast_true(v->value);
  		} else if (!strcasecmp(v->name, "dialmode")) {
  			if (!strcasecmp(v->value, "pulse")) {
- 				confp->chan.dialmode = ANALOG_DIALMODE_PULSE;
+ 				confp->chan.permdialmode = ANALOG_DIALMODE_PULSE;

patches/ast_rtoutpulsing2.diff

@@ -129,11 +129,7 @@ index ae909ebba6..878794ba81 100644
  	/*! \brief -1 = unknown, 0 = no messages, 1 = new messages available */
  	int msgstate;
 
-@@ -302,6 +311,7 @@ struct analog_pvt {
- 	unsigned int callwaitingdeluxe:1;		/*!< TRUE if Call Waiting Deluxe options are available */
- 	unsigned int permhidecallerid:1;		/*!< Whether to hide our outgoing caller ID or not */
+@@ -302,2 +311,3 @@ struct analog_pvt {
  	unsigned int pulse:1;
 +	unsigned int realtimepulsing:1;			/*!< TRUE if realtimepulsing is enabled */
  	unsigned int threewaycalling:1;
- 	unsigned int threewaysilenthold:1;		/*!< Whether to time out a three-way dial tone to silence */
- 	unsigned int transfer:1;

patches/ast_rtoutpulsing_channels.diff

@@ -11,32 +11,3 @@ index 8b4e3ee60f..9ddaf68bec 100644
 
  #if defined(BUSYDETECT_TONEONLY) && defined(BUSYDETECT_COMPARE_TONE_AND_SILENCE)
  #error You cant use BUSYDETECT_TONEONLY together with BUSYDETECT_COMPARE_TONE_AND_SILENCE
-@@ -622,22 +622,23 @@ static int tone_detect(struct ast_dsp *dsp, tone_detect_state_t *s, int16_t *amp
- 		hit = 0;
- 		if (TONE_THRESHOLD <= tone_energy
- 			&& tone_energy > s->energy * s->threshold) {
--			ast_debug(10, "%d Hz tone Hit! %2d Ew=%.4E, Et=%.4E, s/n=%10.2f\n", s->freq, s->hit_count, tone_energy, s->energy, tone_energy / (s->energy - tone_energy));
-+			ast_debug(7, "%d Hz tone Hit! %2d Ew=%.4E, Et=%.4E, s/n=%10.2f\n", s->freq, s->hit_count, tone_energy, s->energy, tone_energy / (s->energy - tone_energy));
- 			hit = 1;
- 		}
- 
--		if (s->hit_count) {
-+		/* Sometimes we may get a lot of hits but not get 2 in succession, leading to a false negative, so always increment XXX Never mind. */
-+		if (s->hit_count) { /* XXX Was 'hit', but reverted because this broke the SF receiver, so reverting this part may make blue boxing slightly harder again */
- 			s->hit_count++;
- 		}
- 
- 		if (hit == s->last_hit) {
- 			if (!hit) {
- 				/* Two successive misses. Tone ended */
-+				if (s->hit_count) {
-+					ast_debug(9, "Tone ended (had %d/%d hits)\n", s->hit_count, s->hits_required);
-+				}
- 				s->hit_count = 0;
--			} else if (!s->hit_count) {
--				s->hit_count++;
- 			}
--
- 		}
- 
- 		if (s->hit_count == s->hits_required) {

patches/blueboxing.diff

@@ -2574,6 +2574,8 @@ phreak_patches() {
 
 	## Merged, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 1234 220400 210900 201400)
 	asterisk_pr_if 1302 220600 211100 201600 # sig_analog: Fix STP, ST2P, ST3P for fgccamamf
+	asterisk_pr_if 1376 220600 211100 201600 # dsp.c debug - needed for blueboxing patch to apply
+	asterisk_pr_if 1379 220600 211100 201600 # chan_dahdi: permdialmode - needed for rtoutpulsing patches to apply
 
 	## Unmerged patches: remove or switch to asterisk_pr_if once merged