Review Board 1.7.16


Fix directed group pickup feature code *8 with pickupsounds enabled , deadlock and segfault, affects 1.8.0 and trunk

Review Request #1185 - Created April 17, 2011 and submitted

Alec Davis
trunk
18654
Reviewers
asterisk-dev
rmudgett
Asterisk
Since 1.8, the new pickupsound and pickupfailsound in features.conf cause many issues.

1). chan_sip:handle_request_invite() shouldn't be playing out the fail/success audio, as it has 'netlock' locked.
2). dialplan applications for directed_pickups shouldn't beep.
3). feature code for directed pickup should beep on success/failure if configured.

Moved app_directed:pickup_do() to features:ast_do_pickup().

Functions below, all now use the new ast_do_pickup()
app_directed_pickup.c:
   pickup_by_channel()
   pickup_by_exten()
   pickup_by_mark()
   pickup_by_part()
features.c:
   ast_pickup_call()

Created a sip_pickup() thread to handle the pickup and playout the audio, spawned from handle_request_invite.
pickup using *8 feature code, with pickup sounds enabled/disabled

exten => 71,1,Pickup()           ; any ringing extension in same pickupgroup 
exten => 72,1,Pickup(85@phones)  ; dahdi extension
exten => 73,1,Pickup(823@phones) ; sip extension

Changes between revision 2 and 11

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16

  1. trunk/apps/app_directed_pickup.c: Loading...
  2. trunk/channels/chan_sip.c: Loading...
  3. trunk/include/asterisk/features.h: Loading...
  4. trunk/main/features.c: Loading...
  5. trunk/res/res_features.exports.in: Loading...
trunk/apps/app_directed_pickup.c
Diff Revision 2 Diff Revision 11
[20] 94 lines
[+20] [+] ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
95

    
   
95

   
96
static const char app[] = "Pickup";
96
static const char app[] = "Pickup";
97
static const char app2[] = "PickupChan";
97
static const char app2[] = "PickupChan";
98
/*! \todo This application should return a result code, like PICKUPRESULT */
98
/*! \todo This application should return a result code, like PICKUPRESULT */
99

    
   
99

   
100
/* Perform actual pickup between two channels */

   
101
static int pickup_do(struct ast_channel *chan, struct ast_channel *target)

   
102
{

   
103
	return ast_do_pickup(chan, target);

   
104
}

   
105

    
   

   
106
/* Helper function that determines whether a channel is capable of being picked up */
100
/* Helper function that determines whether a channel is capable of being picked up */
107
static int can_pickup(struct ast_channel *chan)
101
static int can_pickup(struct ast_channel *chan)
108
{
102
{
109
	if (!chan->pbx && (chan->_state == AST_STATE_RINGING || chan->_state == AST_STATE_RING || chan->_state == AST_STATE_DOWN))
103
	if (!chan->pbx && !chan->masq && (chan->_state == AST_STATE_RINGING || chan->_state == AST_STATE_RING || chan->_state == AST_STATE_DOWN))
110
		return 1;
104
		return 1;
111
	else
105
	else
112
		return 0;
106
		return 0;
113
}
107
}
114

    
   
108

   
[+20] [20] 55 lines
[+20] [+] static int pickup_by_channel(struct ast_channel *chan, char *pickup)
170
		return -1;
164
		return -1;
171
	}
165
	}
172

    
   
166

   
173
	/* Just check that we are not picking up the SAME as target */
167
	/* Just check that we are not picking up the SAME as target */
174
	if (chan != target) {
168
	if (chan != target) {
175
		res = pickup_do(chan, target);
169
		res = ast_do_pickup(chan, target);
176
	}
170
	}
177

    
   

   
178
	ast_channel_unlock(target);
171
	ast_channel_unlock(target);
179
	target = ast_channel_unref(target);
172
	target = ast_channel_unref(target);
180

    
   
173

   
181
	return res;
174
	return res;
182
}
175
}
[+20] [20] 10 lines
[+20] [+] static int pickup_by_exten(struct ast_channel *chan, const char *exten, const char *context)
193
	}
186
	}
194

    
   
187

   
195
	while ((target = ast_channel_iterator_next(iter))) {
188
	while ((target = ast_channel_iterator_next(iter))) {
196
		ast_channel_lock(target);
189
		ast_channel_lock(target);
197
		if ((chan != target) && can_pickup(target)) {
190
		if ((chan != target) && can_pickup(target)) {

    
   
191
			ast_log(LOG_NOTICE,"%s pickup by %s\n", target->name, chan->name);
198
			break;
192
			break;
199
		}
193
		}
200
		ast_channel_unlock(target);
194
		ast_channel_unlock(target);
201
		target = ast_channel_unref(target);
195
		target = ast_channel_unref(target);
202
	}
196
	}
203

    
   
197

   
204
	ast_channel_iterator_destroy(iter);
198
	ast_channel_iterator_destroy(iter);
205

    
   
199

   
206
	if (target) {
200
	if (target) {
207
		res = pickup_do(chan, target);
201
		res = ast_do_pickup(chan, target);
208
		ast_channel_unlock(target);
202
		ast_channel_unlock(target);
209
		target = ast_channel_unref(target);
203
		target = ast_channel_unref(target);
210
	}
204
	}
211

    
   
205

   
212
	return res;
206
	return res;
[+20] [20] 21 lines
[+20] [+] static int find_by_mark(void *obj, void *arg, void *data, int flags)
234
static int pickup_by_mark(struct ast_channel *chan, const char *mark)
228
static int pickup_by_mark(struct ast_channel *chan, const char *mark)
235
{
229
{
236
	struct ast_channel *target;
230
	struct ast_channel *target;
237
	int res = -1;
231
	int res = -1;
238

    
   
232

   
239
	if ((target = ast_channel_callback(find_by_mark, NULL, (char *) mark, 0))) {
233
	if (!(target = ast_channel_callback(find_by_mark, NULL, (char *) mark, 0))) {

    
   
234
		return res;

    
   
235
	}

    
   
236

   
240
		ast_channel_lock(target);
237
	ast_channel_lock(target);
241
		res = pickup_do(chan, target);
238
	if (can_pickup(target)) {

    
   
239
		res = ast_do_pickup(chan, target);

    
   
240
	} else {

    
   
241
		ast_log(LOG_WARNING, "target has gone, or not ringing anymore for %s\n", chan->name);

    
   
242
	}
242
		ast_channel_unlock(target);
243
	ast_channel_unlock(target);
243
		target = ast_channel_unref(target);
244
	target = ast_channel_unref(target);

    
   
245

   

    
   
246
	return res;
244
	}
247
}
245

    
   
248

   

    
   
249
static int find_channel_by_group(void *obj, void *arg, void *data, int flags)

    
   
250
{

    
   
251
	struct ast_channel *chan = obj;

    
   
252
	struct ast_channel *c = data;

    
   
253
	int i;

    
   
254

   

    
   
255
	ast_channel_lock(chan);

    
   
256
	i = (c != chan) && (chan->pickupgroup & c->callgroup) &&

    
   
257
		can_pickup(chan);

    
   
258

   

    
   
259
	ast_channel_unlock(chan);

    
   
260
	return i ? CMP_MATCH | CMP_STOP : 0;

    
   
261
}

    
   
262

   

    
   
263
static int pickup_by_group(struct ast_channel *chan)

    
   
264
{

    
   
265
	struct ast_channel *target;

    
   
266
	int res = -1;

    
   
267

   

    
   
268
	if (!(target = ast_channel_callback(find_channel_by_group, NULL, chan, 0))) {

    
   
269
		return res;

    
   
270
	}

    
   
271

   

    
   
272
	ast_log(LOG_NOTICE, "%s, pickup attempt by %s\n", target->name, chan->name);

    
   
273
	ast_channel_lock(target);

    
   
274
	if (can_pickup(target)) {

    
   
275
		res = ast_do_pickup(chan, target);

    
   
276
	} else {

    
   
277
		ast_log(LOG_WARNING, "target has gone, or not ringing anymore for %s\n", chan->name);

    
   
278
	}

    
   
279
	ast_channel_unlock(target);

    
   
280
	target = ast_channel_unref(target);

    
   
281

   
246
	return res;
282
	return res;
247
}
283
}
248

    
   
284

   
249
/* application entry point for Pickup() */
285
/* application entry point for Pickup() */
250
static int pickup_exec(struct ast_channel *chan, const char *data)
286
static int pickup_exec(struct ast_channel *chan, const char *data)
251
{
287
{
252
	int res = 0;
288
	int res = 0;
253
	char *tmp = ast_strdupa(data);
289
	char *tmp = ast_strdupa(data);
254
	char *exten = NULL, *context = NULL;
290
	char *exten = NULL, *context = NULL;
255

    
   
291

   
256
	if (ast_strlen_zero(data)) {
292
	if (ast_strlen_zero(data)) {
257
		res = ast_pickup_call(chan);
293
		res = pickup_by_group(chan);
258
		return res;
294
		return res;
259
	}
295
	}
260
	
296

   
261
	/* Parse extension (and context if there) */
297
	/* Parse extension (and context if there) */
262
	while (!ast_strlen_zero(tmp) && (exten = strsep(&tmp, "&"))) {
298
	while (!ast_strlen_zero(tmp) && (exten = strsep(&tmp, "&"))) {
263
		if ((context = strchr(exten, '@')))
299
		if ((context = strchr(exten, '@')))
264
			*context++ = '\0';
300
			*context++ = '\0';
265
		if (!ast_strlen_zero(context) && !strcasecmp(context, PICKUPMARK)) {
301
		if (!ast_strlen_zero(context) && !strcasecmp(context, PICKUPMARK)) {
[+20] [20] 32 lines
[+20] [+] static int pickup_by_part(struct ast_channel *chan, const char *part)
298
	struct ast_channel *target;
334
	struct ast_channel *target;
299
	int res = -1;
335
	int res = -1;
300

    
   
336

   
301
	if ((target = ast_channel_callback(find_by_part, NULL, (char *) part, 0))) {
337
	if ((target = ast_channel_callback(find_by_part, NULL, (char *) part, 0))) {
302
		ast_channel_lock(target);
338
		ast_channel_lock(target);
303
		res = pickup_do(chan, target);
339
		if (can_pickup(target)) {

    
   
340
			res = ast_do_pickup(chan, target);

    
   
341
		} else {

    
   
342
			ast_log(LOG_WARNING, "target has gone, or not ringing anymore for %s\n", chan->name);

    
   
343
		}
304
		ast_channel_unlock(target);
344
		ast_channel_unlock(target);
305
		target = ast_channel_unref(target);
345
		target = ast_channel_unref(target);
306
	}
346
	}
307

    
   
347

   
308
	return res;
348
	return res;
[+20] [20] 64 lines
trunk/channels/chan_sip.c
Diff Revision 2 Diff Revision 11
 
trunk/include/asterisk/features.h
Diff Revision 2 Diff Revision 11
 
trunk/main/features.c
Diff Revision 2 Diff Revision 11
 
trunk/res/res_features.exports.in
Diff Revision 2 Diff Revision 11
 
  1. trunk/apps/app_directed_pickup.c: Loading...
  2. trunk/channels/chan_sip.c: Loading...
  3. trunk/include/asterisk/features.h: Loading...
  4. trunk/main/features.c: Loading...
  5. trunk/res/res_features.exports.in: Loading...

https://reviewboard.asterisk.org/ runs on a server provided by Digium, Inc. and uses bandwidth donated to the open source Asterisk community by API Digital Communications in Huntsville, AL USA.
Please report problems with this site to asteriskteam@digium.com.