projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixup
[lcr.git]
/
mISDN.cpp
diff --git
a/mISDN.cpp
b/mISDN.cpp
index
a7facb6
..
d67d0e8
100644
(file)
--- a/
mISDN.cpp
+++ b/
mISDN.cpp
@@
-405,6
+405,8
@@
static int _bchannel_create(struct mISDNport *mISDNport, int i)
int ret;
struct sockaddr_mISDN addr;
int ret;
struct sockaddr_mISDN addr;
+ memset(&addr, 0, sizeof(addr));
+
if (mISDNport->b_sock[i].inuse) {
PERROR("Error: Socket already created for index %d\n", i);
return(0);
if (mISDNport->b_sock[i].inuse) {
PERROR("Error: Socket already created for index %d\n", i);
return(0);
@@
-1224,9
+1226,9
@@
void PmISDN::set_tone(const char *dir, const char *tone)
/* if no directory is given (by extension), we use interface.conf or options.conf */
if (!dir || !dir[0]) {
/* if no directory is given (by extension), we use interface.conf or options.conf */
if (!dir || !dir[0]) {
- if (p_
m_mISDNport->ifport->tones_dir
[0])
- dir = p_
m_mISDNport->ifport->tones_dir
;
- else
if (options.tones_dir[0])
+ if (p_
tones_interface
[0])
+ dir = p_
tones_interface
;
+ else
dir = options.tones_dir;
}
dir = options.tones_dir;
}
@@
-1817,6
+1819,8
@@
int mISDN_getportbyname(int sock, int cnt, char *portname)
struct mISDN_devinfo devinfo;
int port = 0, ret;
struct mISDN_devinfo devinfo;
int port = 0, ret;
+ memset(&devinfo, 0, sizeof(devinfo));
+
/* resolve name */
while (port < cnt) {
devinfo.id = port;
/* resolve name */
while (port < cnt) {
devinfo.id = port;
@@
-1892,6
+1896,8
@@
struct mISDNport *mISDNport_open(struct interface_port *ifport)
struct mISDN_devinfo devinfo;
unsigned int protocol, prop;
struct mISDN_devinfo devinfo;
unsigned int protocol, prop;
+ memset(&devinfo, 0, sizeof(devinfo));
+
/* check port counts */
ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt);
if (ret < 0) {
/* check port counts */
ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt);
if (ret < 0) {