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 12

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 12
1
/*
1
/*
2
 * Asterisk -- An open source telephony toolkit.
2
 * Asterisk -- An open source telephony toolkit.
3
 *
3
 *
4
 * Copyright (C) 2005, Joshua Colp
4
 * Copyright (C) 2005, Joshua Colp
5
 *
5
 *
6
 * Joshua Colp <jcolp@digium.com>
6
 * Joshua Colp <jcolp@digium.com>
7
 *
7
 *
8
 * Portions merged from app_pickupchan, which was
8
 * Portions merged from app_pickupchan, which was
9
 * Copyright (C) 2008, Gary Cook
9
 * Copyright (C) 2008, Gary Cook
10
 *
10
 *
11
 * See http://www.asterisk.org for more information about
11
 * See http://www.asterisk.org for more information about
12
 * the Asterisk project. Please do not directly contact
12
 * the Asterisk project. Please do not directly contact
13
 * any of the maintainers of this project for assistance;
13
 * any of the maintainers of this project for assistance;
14
 * the project provides a web site, mailing lists and IRC
14
 * the project provides a web site, mailing lists and IRC
15
 * channels for your use.
15
 * channels for your use.
16
 *
16
 *
17
 * This program is free software, distributed under the terms of
17
 * This program is free software, distributed under the terms of
18
 * the GNU General Public License Version 2. See the LICENSE file
18
 * the GNU General Public License Version 2. See the LICENSE file
19
 * at the top of the source tree.
19
 * at the top of the source tree.
20
 */
20
 */
21

    
   
21

   
22
/*! \file
22
/*! \file
23
 *
23
 *
24
 * \brief Directed Call Pickup Support
24
 * \brief Directed Call Pickup Support
25
 *
25
 *
26
 * \author Joshua Colp <jcolp@digium.com>
26
 * \author Joshua Colp <jcolp@digium.com>
27
 * \author Gary Cook
27
 * \author Gary Cook
28
 *
28
 *
29
 * \ingroup applications
29
 * \ingroup applications
30
 */
30
 */
31

    
   
31

   
32
#include "asterisk.h"
32
#include "asterisk.h"
33

    
   
33

   
34
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
34
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
35

    
   
35

   
36
#include "asterisk/file.h"
36
#include "asterisk/file.h"
37
#include "asterisk/channel.h"
37
#include "asterisk/channel.h"
38
#include "asterisk/pbx.h"
38
#include "asterisk/pbx.h"
39
#include "asterisk/module.h"
39
#include "asterisk/module.h"
40
#include "asterisk/lock.h"
40
#include "asterisk/lock.h"
41
#include "asterisk/app.h"
41
#include "asterisk/app.h"
42
#include "asterisk/features.h"
42
#include "asterisk/features.h"
43
#include "asterisk/manager.h"
43
#include "asterisk/manager.h"
44
#include "asterisk/callerid.h"
44
#include "asterisk/callerid.h"
45
#include "asterisk/cel.h"
45
#include "asterisk/cel.h"
46

    
   
46

   
47
#define PICKUPMARK "PICKUPMARK"
47
#define PICKUPMARK "PICKUPMARK"
48

    
   
48

   
49
/*** DOCUMENTATION
49
/*** DOCUMENTATION
50
	<application name="Pickup" language="en_US">
50
	<application name="Pickup" language="en_US">
51
		<synopsis>
51
		<synopsis>
52
			Directed extension call pickup.
52
			Directed extension call pickup.
53
		</synopsis>
53
		</synopsis>
54
		<syntax argsep="&amp;">
54
		<syntax argsep="&amp;">
55
			<parameter name="ext" argsep="@" required="true">
55
			<parameter name="ext" argsep="@" required="true">
56
				<argument name="extension" required="true"/>
56
				<argument name="extension" required="true"/>
57
				<argument name="context" />
57
				<argument name="context" />
58
			</parameter>
58
			</parameter>
59
			<parameter name="ext2" argsep="@" multiple="true">
59
			<parameter name="ext2" argsep="@" multiple="true">
60
				<argument name="extension2" required="true"/>
60
				<argument name="extension2" required="true"/>
61
				<argument name="context2"/>
61
				<argument name="context2"/>
62
			</parameter>
62
			</parameter>
63
		</syntax>
63
		</syntax>
64
		<description>
64
		<description>
65
			<para>This application can pickup any ringing channel that is calling
65
			<para>This application can pickup any ringing channel that is calling
66
			the specified <replaceable>extension</replaceable>. If no <replaceable>context</replaceable>
66
			the specified <replaceable>extension</replaceable>. If no <replaceable>context</replaceable>
67
			is specified, the current context will be used. If you use the special string <literal>PICKUPMARK</literal>
67
			is specified, the current context will be used. If you use the special string <literal>PICKUPMARK</literal>
68
			for the context parameter, for example 10@PICKUPMARK, this application
68
			for the context parameter, for example 10@PICKUPMARK, this application
69
			tries to find a channel which has defined a <variable>PICKUPMARK</variable>
69
			tries to find a channel which has defined a <variable>PICKUPMARK</variable>
70
			channel variable with the same value as <replaceable>extension</replaceable>
70
			channel variable with the same value as <replaceable>extension</replaceable>
71
			(in this example, <literal>10</literal>). When no parameter is specified, the application
71
			(in this example, <literal>10</literal>). When no parameter is specified, the application
72
			will pickup a channel matching the pickup group of the active channel.</para>
72
			will pickup a channel matching the pickup group of the active channel.</para>
73
		</description>
73
		</description>
74
	</application>
74
	</application>
75
	<application name="PickupChan" language="en_US">
75
	<application name="PickupChan" language="en_US">
76
		<synopsis>
76
		<synopsis>
77
			Pickup a ringing channel.
77
			Pickup a ringing channel.
78
		</synopsis>
78
		</synopsis>
79
		<syntax>
79
		<syntax>
80
			<parameter name="channel" required="true" />
80
			<parameter name="channel" required="true" />
81
			<parameter name="channel2" multiple="true" />
81
			<parameter name="channel2" multiple="true" />
82
			<parameter name="options" required="false">
82
			<parameter name="options" required="false">
83
				<optionlist>
83
				<optionlist>
84
					<option name="p">
84
					<option name="p">
85
						<para>Channel name specified partial name. Used when find channel by callid.</para>
85
						<para>Channel name specified partial name. Used when find channel by callid.</para>
86
					</option>
86
					</option>
87
				</optionlist>
87
				</optionlist>
88
			</parameter>
88
			</parameter>
89
		</syntax>
89
		</syntax>
90
		<description>
90
		<description>
91
			<para>This will pickup a specified <replaceable>channel</replaceable> if ringing.</para>
91
			<para>This will pickup a specified <replaceable>channel</replaceable> if ringing.</para>
92
		</description>
92
		</description>
93
	</application>
93
	</application>
94
 ***/
94
 ***/
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 &&

    
   
104
		!ast_test_flag(chan, AST_FLAG_ZOMBIE) &&

    
   
105
		(chan->_state == AST_STATE_RINGING ||

    
   
106
		 chan->_state == AST_STATE_RING ||

    
   
107
		 chan->_state == AST_STATE_DOWN)) {
110
		return 1;
108
		return 1;
111
	else
109
	}
112
		return 0;
110
	return 0;
113
}
111
}
114

    
   
112

   
115
struct pickup_by_name_args {
113
struct pickup_by_name_args {
116
	const char *name;
114
	const char *name;
117
	size_t len;
115
	size_t len;
118
};
116
};
119

    
   
117

   
120
static int pickup_by_name_cb(void *obj, void *arg, void *data, int flags)
118
static int pickup_by_name_cb(void *obj, void *arg, void *data, int flags)
121
{
119
{
122
	struct ast_channel *chan = obj;
120
	struct ast_channel *chan = obj;
123
	struct pickup_by_name_args *args = data;
121
	struct pickup_by_name_args *args = data;
124

    
   
122

   
125
	ast_channel_lock(chan);
123
	ast_channel_lock(chan);
126
	if (!strncasecmp(chan->name, args->name, args->len) && can_pickup(chan)) {
124
	if (!strncasecmp(chan->name, args->name, args->len) && can_pickup(chan)) {
127
		/* Return with the channel still locked on purpose */
125
		/* Return with the channel still locked on purpose */
128
		return CMP_MATCH | CMP_STOP;
126
		return CMP_MATCH | CMP_STOP;
129
	}
127
	}
130
	ast_channel_unlock(chan);
128
	ast_channel_unlock(chan);
131

    
   
129

   
132
	return 0;
130
	return 0;
133
}
131
}
134

    
   
132

   
135
/*! \brief Helper Function to walk through ALL channels checking NAME and STATE */
133
/*! \brief Helper Function to walk through ALL channels checking NAME and STATE */
136
static struct ast_channel *my_ast_get_channel_by_name_locked(const char *channame)
134
static struct ast_channel *my_ast_get_channel_by_name_locked(const char *channame)
137
{
135
{
138
	char *chkchan;
136
	char *chkchan;
139
	struct pickup_by_name_args pickup_args;
137
	struct pickup_by_name_args pickup_args;
140

    
   
138

   
141
	/* Check if channel name contains a '-'.
139
	/* Check if channel name contains a '-'.
142
	 * In this case the channel name will be interpreted as full channel name.
140
	 * In this case the channel name will be interpreted as full channel name.
143
	 */
141
	 */
144
	if (strchr(channame, '-')) {
142
	if (strchr(channame, '-')) {
145
		/* check full channel name */
143
		/* check full channel name */
146
		pickup_args.len = strlen(channame);
144
		pickup_args.len = strlen(channame);
147
		pickup_args.name = channame;
145
		pickup_args.name = channame;
148
	} else {
146
	} else {
149
		/* need to append a '-' for the comparison so we check full channel name,
147
		/* need to append a '-' for the comparison so we check full channel name,
150
		 * i.e SIP/hgc- , use a temporary variable so original stays the same for
148
		 * i.e SIP/hgc- , use a temporary variable so original stays the same for
151
		 * debugging.
149
		 * debugging.
152
		 */
150
		 */
153
		pickup_args.len = strlen(channame) + 1;
151
		pickup_args.len = strlen(channame) + 1;
154
		chkchan = alloca(pickup_args.len + 1);
152
		chkchan = alloca(pickup_args.len + 1);
155
		strcpy(chkchan, channame);
153
		strcpy(chkchan, channame);
156
		strcat(chkchan, "-");
154
		strcat(chkchan, "-");
157
		pickup_args.name = chkchan;
155
		pickup_args.name = chkchan;
158
	}
156
	}
159

    
   
157

   
160
	return ast_channel_callback(pickup_by_name_cb, NULL, &pickup_args, 0);
158
	return ast_channel_callback(pickup_by_name_cb, NULL, &pickup_args, 0);
161
}
159
}
162

    
   
160

   
163
/*! \brief Attempt to pick up specified channel named , does not use context */
161
/*! \brief Attempt to pick up specified channel named , does not use context */
164
static int pickup_by_channel(struct ast_channel *chan, char *pickup)
162
static int pickup_by_channel(struct ast_channel *chan, char *pickup)
165
{
163
{
166
	int res = 0;
164
	int res = 0;
167
	struct ast_channel *target;
165
	struct ast_channel *target;
168

    
   
166

   
169
	if (!(target = my_ast_get_channel_by_name_locked(pickup))) {
167
	if (!(target = my_ast_get_channel_by_name_locked(pickup))) {
170
		return -1;
168
		return -1;
171
	}
169
	}
172

    
   
170

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

    
   

   
178
	ast_channel_unlock(target);
175
	ast_channel_unlock(target);
179
	target = ast_channel_unref(target);
176
	target = ast_channel_unref(target);
180

    
   
177

   
181
	return res;
178
	return res;
182
}
179
}
183

    
   
180

   
184
/* Attempt to pick up specified extension with context */
181
/* Attempt to pick up specified extension with context */
185
static int pickup_by_exten(struct ast_channel *chan, const char *exten, const char *context)
182
static int pickup_by_exten(struct ast_channel *chan, const char *exten, const char *context)
186
{
183
{
187
	struct ast_channel *target = NULL;
184
	struct ast_channel *target = NULL;
188
	struct ast_channel_iterator *iter;
185
	struct ast_channel_iterator *iter;
189
	int res = -1;
186
	int res = -1;
190

    
   
187

   
191
	if (!(iter = ast_channel_iterator_by_exten_new(exten, context))) {
188
	if (!(iter = ast_channel_iterator_by_exten_new(exten, context))) {
192
		return -1;
189
		return -1;
193
	}
190
	}
194

    
   
191

   
195
	while ((target = ast_channel_iterator_next(iter))) {
192
	while ((target = ast_channel_iterator_next(iter))) {
196
		ast_channel_lock(target);
193
		ast_channel_lock(target);
197
		if ((chan != target) && can_pickup(target)) {
194
		if ((chan != target) && can_pickup(target)) {

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

    
   
201

   
204
	ast_channel_iterator_destroy(iter);
202
	ast_channel_iterator_destroy(iter);
205

    
   
203

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

    
   
209

   
212
	return res;
210
	return res;
213
}
211
}
214

    
   
212

   
215
static int find_by_mark(void *obj, void *arg, void *data, int flags)
213
static int find_by_mark(void *obj, void *arg, void *data, int flags)
216
{
214
{
217
	struct ast_channel *c = obj;
215
	struct ast_channel *c = obj;
218
	const char *mark = data;
216
	const char *mark = data;
219
	const char *tmp;
217
	const char *tmp;
220
	int res;
218
	int res;
221

    
   
219

   
222
	ast_channel_lock(c);
220
	ast_channel_lock(c);
223

    
   
221

   
224
	res = (tmp = pbx_builtin_getvar_helper(c, PICKUPMARK)) &&
222
	res = (tmp = pbx_builtin_getvar_helper(c, PICKUPMARK)) &&
225
		!strcasecmp(tmp, mark) &&
223
		!strcasecmp(tmp, mark) &&
226
		can_pickup(c);
224
		can_pickup(c);
227

    
   
225

   
228
	ast_channel_unlock(c);
226
	ast_channel_unlock(c);
229

    
   
227

   
230
	return res ? CMP_MATCH | CMP_STOP : 0;
228
	return res ? CMP_MATCH | CMP_STOP : 0;
231
}
229
}
232

    
   
230

   
233
/* Attempt to pick up specified mark */
231
/* Attempt to pick up specified mark */
234
static int pickup_by_mark(struct ast_channel *chan, const char *mark)
232
static int pickup_by_mark(struct ast_channel *chan, const char *mark)
235
{
233
{
236
	struct ast_channel *target;
234
	struct ast_channel *target;
237
	int res = -1;
235
	int res = -1;
238

    
   
236

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

    
   
238
		return res;

    
   
239
	}

    
   
240

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

    
   
243
		res = ast_do_pickup(chan, target);

    
   
244
	} else {

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

    
   
246
	}
242
		ast_channel_unlock(target);
247
	ast_channel_unlock(target);
243
		target = ast_channel_unref(target);
248
	target = ast_channel_unref(target);

    
   
249

   

    
   
250
	return res;

    
   
251
}

    
   
252

   

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

    
   
254
{

    
   
255
	struct ast_channel *chan = obj;

    
   
256
	struct ast_channel *c = data;

    
   
257
	int i;

    
   
258

   

    
   
259
	ast_channel_lock(chan);

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

    
   
261
		can_pickup(chan);

    
   
262

   

    
   
263
	ast_channel_unlock(chan);

    
   
264
	return i ? CMP_MATCH | CMP_STOP : 0;

    
   
265
}

    
   
266

   

    
   
267
static int pickup_by_group(struct ast_channel *chan)

    
   
268
{

    
   
269
	struct ast_channel *target;

    
   
270
	int res = -1;

    
   
271

   

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

    
   
273
		return res;
244
	}
274
	}
245

    
   
275

   

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

    
   
277
	ast_channel_lock(target);

    
   
278
	if (can_pickup(target)) {

    
   
279
		res = ast_do_pickup(chan, target);

    
   
280
	} else {

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

    
   
282
	}

    
   
283
	ast_channel_unlock(target);

    
   
284
	target = ast_channel_unref(target);

    
   
285

   
246
	return res;
286
	return res;
247
}
287
}
248

    
   
288

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

    
   
295

   
256
	if (ast_strlen_zero(data)) {
296
	if (ast_strlen_zero(data)) {
257
		res = ast_pickup_call(chan);
297
		res = pickup_by_group(chan);
258
		return res;
298
		return res;
259
	}
299
	}
260
	
300

   
261
	/* Parse extension (and context if there) */
301
	/* Parse extension (and context if there) */
262
	while (!ast_strlen_zero(tmp) && (exten = strsep(&tmp, "&"))) {
302
	while (!ast_strlen_zero(tmp) && (exten = strsep(&tmp, "&"))) {
263
		if ((context = strchr(exten, '@')))
303
		if ((context = strchr(exten, '@')))
264
			*context++ = '\0';
304
			*context++ = '\0';
265
		if (!ast_strlen_zero(context) && !strcasecmp(context, PICKUPMARK)) {
305
		if (!ast_strlen_zero(context) && !strcasecmp(context, PICKUPMARK)) {
266
			if (!pickup_by_mark(chan, exten))
306
			if (!pickup_by_mark(chan, exten))
267
				break;
307
				break;
268
		} else {
308
		} else {
269
			if (!pickup_by_exten(chan, exten, !ast_strlen_zero(context) ? context : chan->context))
309
			if (!pickup_by_exten(chan, exten, !ast_strlen_zero(context) ? context : chan->context))
270
				break;
310
				break;
271
		}
311
		}
272
		ast_log(LOG_NOTICE, "No target channel found for %s.\n", exten);
312
		ast_log(LOG_NOTICE, "No target channel found for %s.\n", exten);
273
	}
313
	}
274

    
   
314

   
275
	return res;
315
	return res;
276
}
316
}
277

    
   
317

   
278
/* Find channel for pick up specified by partial channel name */ 
318
/* Find channel for pick up specified by partial channel name */ 
279
static int find_by_part(void *obj, void *arg, void *data, int flags)
319
static int find_by_part(void *obj, void *arg, void *data, int flags)
280
{
320
{
281
	struct ast_channel *c = obj; 
321
	struct ast_channel *c = obj; 
282
	const char *part = data;
322
	const char *part = data;
283
	int res = 0;
323
	int res = 0;
284
	int len = strlen(part);
324
	int len = strlen(part);
285

    
   
325

   
286
	ast_channel_lock(c);
326
	ast_channel_lock(c);
287
	if (len <= strlen(c->name)) {
327
	if (len <= strlen(c->name)) {
288
		res = !(strncmp(c->name, part, len)) && (can_pickup(c));
328
		res = !(strncmp(c->name, part, len)) && (can_pickup(c));
289
	}
329
	}
290
	ast_channel_unlock(c);
330
	ast_channel_unlock(c);
291

    
   
331

   
292
	return res ? CMP_MATCH | CMP_STOP : 0;
332
	return res ? CMP_MATCH | CMP_STOP : 0;
293
}
333
}
294

    
   
334

   
295
/* Attempt to pick up specified by partial channel name */ 
335
/* Attempt to pick up specified by partial channel name */ 
296
static int pickup_by_part(struct ast_channel *chan, const char *part)
336
static int pickup_by_part(struct ast_channel *chan, const char *part)
297
{
337
{
298
	struct ast_channel *target;
338
	struct ast_channel *target;
299
	int res = -1;
339
	int res = -1;
300

    
   
340

   
301
	if ((target = ast_channel_callback(find_by_part, NULL, (char *) part, 0))) {
341
	if ((target = ast_channel_callback(find_by_part, NULL, (char *) part, 0))) {
302
		ast_channel_lock(target);
342
		ast_channel_lock(target);
303
		res = pickup_do(chan, target);
343
		if (can_pickup(target)) {

    
   
344
			res = ast_do_pickup(chan, target);

    
   
345
		} else {

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

    
   
347
		}
304
		ast_channel_unlock(target);
348
		ast_channel_unlock(target);
305
		target = ast_channel_unref(target);
349
		target = ast_channel_unref(target);
306
	}
350
	}
307

    
   
351

   
308
	return res;
352
	return res;
309
}
353
}
310

    
   
354

   
311
/* application entry point for PickupChan() */
355
/* application entry point for PickupChan() */
312
static int pickupchan_exec(struct ast_channel *chan, const char *data)
356
static int pickupchan_exec(struct ast_channel *chan, const char *data)
313
{
357
{
314
	int res = 0;
358
	int res = 0;
315
	int partial_pickup = 0;
359
	int partial_pickup = 0;
316
	char *pickup = NULL;
360
	char *pickup = NULL;
317
	char *parse = ast_strdupa(data);
361
	char *parse = ast_strdupa(data);
318
	AST_DECLARE_APP_ARGS(args,
362
	AST_DECLARE_APP_ARGS(args,
319
		AST_APP_ARG(channel);
363
		AST_APP_ARG(channel);
320
		AST_APP_ARG(options);
364
		AST_APP_ARG(options);
321
	);
365
	);
322
	AST_STANDARD_APP_ARGS(args, parse);
366
	AST_STANDARD_APP_ARGS(args, parse);
323

    
   
367

   
324
	if (ast_strlen_zero(args.channel)) {
368
	if (ast_strlen_zero(args.channel)) {
325
		ast_log(LOG_WARNING, "PickupChan requires an argument (channel)!\n");
369
		ast_log(LOG_WARNING, "PickupChan requires an argument (channel)!\n");
326
		return -1;
370
		return -1;
327
	}
371
	}
328

    
   
372

   
329
	if (!ast_strlen_zero(args.options) && strchr(args.options, 'p')) {
373
	if (!ast_strlen_zero(args.options) && strchr(args.options, 'p')) {
330
		partial_pickup = 1;
374
		partial_pickup = 1;
331
	}
375
	}
332

    
   
376

   
333
	/* Parse channel */
377
	/* Parse channel */
334
	while (!ast_strlen_zero(args.channel) && (pickup = strsep(&args.channel, "&"))) {
378
	while (!ast_strlen_zero(args.channel) && (pickup = strsep(&args.channel, "&"))) {
335
		if (!strncasecmp(chan->name, pickup, strlen(pickup))) {
379
		if (!strncasecmp(chan->name, pickup, strlen(pickup))) {
336
			ast_log(LOG_NOTICE, "Cannot pickup your own channel %s.\n", pickup);
380
			ast_log(LOG_NOTICE, "Cannot pickup your own channel %s.\n", pickup);
337
		} else {
381
		} else {
338
			if (partial_pickup) {
382
			if (partial_pickup) {
339
				if (!pickup_by_part(chan, pickup)) {
383
				if (!pickup_by_part(chan, pickup)) {
340
					break;
384
					break;
341
				}
385
				}
342
			} else if (!pickup_by_channel(chan, pickup)) {
386
			} else if (!pickup_by_channel(chan, pickup)) {
343
				break;
387
				break;
344
			}
388
			}
345
			ast_log(LOG_NOTICE, "No target channel found for %s.\n", pickup);
389
			ast_log(LOG_NOTICE, "No target channel found for %s.\n", pickup);
346
		}
390
		}
347
	}
391
	}
348

    
   
392

   
349
	return res;
393
	return res;
350
}
394
}
351

    
   
395

   
352
static int unload_module(void)
396
static int unload_module(void)
353
{
397
{
354
	int res;
398
	int res;
355

    
   
399

   
356
	res = ast_unregister_application(app);
400
	res = ast_unregister_application(app);
357
	res |= ast_unregister_application(app2);
401
	res |= ast_unregister_application(app2);
358

    
   
402

   
359
	return res;
403
	return res;
360
}
404
}
361

    
   
405

   
362
static int load_module(void)
406
static int load_module(void)
363
{
407
{
364
	int res;
408
	int res;
365

    
   
409

   
366
	res = ast_register_application_xml(app, pickup_exec);
410
	res = ast_register_application_xml(app, pickup_exec);
367
	res |= ast_register_application_xml(app2, pickupchan_exec);
411
	res |= ast_register_application_xml(app2, pickupchan_exec);
368

    
   
412

   
369
	return res;
413
	return res;
370
}
414
}
371

    
   
415

   
372
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Directed Call Pickup Application");
416
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Directed Call Pickup Application");
trunk/channels/chan_sip.c
Diff Revision 2 Diff Revision 12
 
trunk/include/asterisk/features.h
Diff Revision 2 Diff Revision 12
 
trunk/main/features.c
Diff Revision 2 Diff Revision 12
 
trunk/res/res_features.exports.in
Diff Revision 2 Diff Revision 12 - File Reverted
 
  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.