projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix lot of warnings
[lcr.git]
/
chan_lcr.c
diff --git
a/chan_lcr.c
b/chan_lcr.c
index
906e6a3
..
52c2a31
100644
(file)
--- a/
chan_lcr.c
+++ b/
chan_lcr.c
@@
-1428,7
+1428,6
@@
int handle_socket(void)
int open_socket(void)
{
int ret;
int open_socket(void)
{
int ret;
- char *socket_name = SOCKET_NAME;
int conn;
struct sockaddr_un sock_address;
unsigned int on = 1;
int conn;
struct sockaddr_un sock_address;
unsigned int on = 1;
@@
-1444,7
+1443,7
@@
int open_socket(void)
/* set socket address and name */
memset(&sock_address, 0, sizeof(sock_address));
sock_address.sun_family = PF_UNIX;
/* set socket address and name */
memset(&sock_address, 0, sizeof(sock_address));
sock_address.sun_family = PF_UNIX;
- s
trcpy(sock_address.sun_path, socket_name
);
+ s
printf(sock_address.sun_path, SOCKET_NAME, options.lock
);
/* connect socket */
if ((conn = connect(lcr_sock, (struct sockaddr *)&sock_address, SUN_LEN(&sock_address))) < 0)
/* connect socket */
if ((conn = connect(lcr_sock, (struct sockaddr *)&sock_address, SUN_LEN(&sock_address))) < 0)
@@
-2096,21
+2095,25
@@
static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
/*
* fixup asterisk
*/
/*
* fixup asterisk
*/
-static int lcr_fixup(struct ast_channel *oldast, struct ast_channel *
new
ast)
+static int lcr_fixup(struct ast_channel *oldast, struct ast_channel *ast)
{
struct chan_call *call;
{
struct chan_call *call;
+ if (!ast) {
+ return -1;
+ }
+
ast_mutex_lock(&chan_lock);
ast_mutex_lock(&chan_lock);
- call =
old
ast->tech_pvt;
+ call = ast->tech_pvt;
if (!call) {
if (!call) {
- CERROR(NULL,
old
ast, "Received fixup from Asterisk, but no call instance exists.\n");
+ CERROR(NULL, ast, "Received fixup from Asterisk, but no call instance exists.\n");
ast_mutex_unlock(&chan_lock);
return -1;
}
ast_mutex_unlock(&chan_lock);
return -1;
}
- CDEBUG(call,
old
ast, "Received fixup from Asterisk.\n");
- call->ast =
new
ast;
- ast_mutex_lock(&chan_lock);
+ CDEBUG(call, ast, "Received fixup from Asterisk.\n");
+ call->ast = ast;
+ ast_mutex_
un
lock(&chan_lock);
return 0;
}
return 0;
}