projects
/
lcr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
221ad36
)
Changes needed for Asterisk TRUNK 357721
author
Birger Harzenetter
<WIMPy@yeti.dk>
Sun, 24 Jun 2012 06:33:59 +0000
(08:33 +0200)
committer
Andreas Eversberg
<jolly@eversberg.eu>
Sun, 24 Jun 2012 06:33:59 +0000
(08:33 +0200)
chan_lcr.c
patch
|
blob
|
history
diff --git
a/chan_lcr.c
b/chan_lcr.c
index
ef48739
..
a2951ae
100644
(file)
--- a/
chan_lcr.c
+++ b/
chan_lcr.c
@@
-161,8
+161,9
@@
it is called from ast_channel process which has already locked ast_channel.
#include <asterisk/app.h>
#include <asterisk/features.h>
#include <asterisk/sched.h>
#include <asterisk/app.h>
#include <asterisk/features.h>
#include <asterisk/sched.h>
+#if ASTERISK_VERSION_NUM < 110000
#include <asterisk/version.h>
#include <asterisk/version.h>
-
+#endif
#include "extension.h"
#include "message.h"
#include "callerid.h"
#include "extension.h"
#include "message.h"
#include "callerid.h"
@@
-959,11
+960,12
@@
static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
#if ASTERISK_VERSION_NUM < 110000
ast->tech_pvt = call;
ast->tech = &lcr_tech;
#if ASTERISK_VERSION_NUM < 110000
ast->tech_pvt = call;
ast->tech = &lcr_tech;
+ ast->fds[0] = call->pipe[0];
#else
ast_channel_tech_pvt_set(ast, call);
ast_channel_tech_set(ast, &lcr_tech);
#else
ast_channel_tech_pvt_set(ast, call);
ast_channel_tech_set(ast, &lcr_tech);
+ ast_channel_set_fd(ast, 0, call->pipe[0]);
#endif
#endif
- ast->fds[0] = call->pipe[0];
/* fill setup information */
if (param->setup.dialinginfo.id)
/* fill setup information */
if (param->setup.dialinginfo.id)
@@
-2179,10
+2181,11
@@
struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
call->ast = ast;
#if ASTERISK_VERSION_NUM < 110000
ast->tech_pvt = call;
call->ast = ast;
#if ASTERISK_VERSION_NUM < 110000
ast->tech_pvt = call;
+ ast->fds[0] = call->pipe[0];
#else
ast_channel_tech_pvt_set(ast, call);
#else
ast_channel_tech_pvt_set(ast, call);
+ ast_channel_set_fd(ast, 0, call->pipe[0]);
#endif
#endif
- ast->fds[0] = call->pipe[0];
call->pbx_started = 0;
/* set state */
call->state = CHAN_LCR_STATE_OUT_PREPARE;
call->pbx_started = 0;
/* set state */
call->state = CHAN_LCR_STATE_OUT_PREPARE;
@@
-2731,10
+2734,11
@@
static int lcr_hangup(struct ast_channel *ast)
/* disconnect asterisk, maybe not required */
#if ASTERISK_VERSION_NUM < 110000
ast->tech_pvt = NULL;
/* disconnect asterisk, maybe not required */
#if ASTERISK_VERSION_NUM < 110000
ast->tech_pvt = NULL;
+ ast->fds[0] = -1;
#else
ast_channel_tech_pvt_set(ast, NULL);
#else
ast_channel_tech_pvt_set(ast, NULL);
+ ast_channel_set_fd(ast, 0, -1);
#endif
#endif
- ast->fds[0] = -1;
if (call->ref) {
/* release */
CDEBUG(call, ast, "Releasing ref and freeing call instance.\n");
if (call->ref) {
/* release */
CDEBUG(call, ast, "Releasing ref and freeing call instance.\n");