projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed trace bugs.
[lcr.git]
/
vbox.cpp
diff --git
a/vbox.cpp
b/vbox.cpp
index
238a1da
..
158a113
100644
(file)
--- a/
vbox.cpp
+++ b/
vbox.cpp
@@
-13,16
+13,6
@@
** **
\*****************************************************************************/
** **
\*****************************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <poll.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
#include "main.h"
/* note: recording log is written at endpoint */
#include "main.h"
/* note: recording log is written at endpoint */
@@
-55,12
+45,12
@@
VBoxPort::~VBoxPort()
}
}
-static void vbox_trace_header(class VBoxPort *vbox, char *message, int direction)
+static void vbox_trace_header(class VBoxPort *vbox, c
onst c
har *message, int direction)
{
/* init trace with given values */
{
/* init trace with given values */
- start_trace(
0
,
+ start_trace(
-1
,
NULL,
NULL,
- vbox?numberrize_callerinfo(vbox->p_callerinfo.id, vbox->p_callerinfo.ntype):NULL,
+ vbox?numberrize_callerinfo(vbox->p_callerinfo.id, vbox->p_callerinfo.ntype
, options.national, options.international
):NULL,
vbox?vbox->p_dialinginfo.id:NULL,
direction,
CATEGORY_CH,
vbox?vbox->p_dialinginfo.id:NULL,
direction,
CATEGORY_CH,
@@
-74,8
+64,8
@@
static void vbox_trace_header(class VBoxPort *vbox, char *message, int direction
*/
int VBoxPort::handler(void)
{
*/
int VBoxPort::handler(void)
{
- struct
message
*message;
- unsigned
long
tosend;
+ struct
lcr_msg
*message;
+ unsigned
int
tosend;
unsigned char buffer[ISDN_TRANSMIT];
time_t currenttime;
class Endpoint *epoint;
unsigned char buffer[ISDN_TRANSMIT];
time_t currenttime;
class Endpoint *epoint;
@@
-117,7
+107,7
@@
int VBoxPort::handler(void)
}
/* calculate the number of bytes */
}
/* calculate the number of bytes */
- tosend = (unsigned
long
)((now_d-p_vbox_audio_start)*8000) - p_vbox_audio_transferred;
+ tosend = (unsigned
int
)((now_d-p_vbox_audio_start)*8000) - p_vbox_audio_transferred;
/* wait for more */
if (tosend < sizeof(buffer))
/* wait for more */
if (tosend < sizeof(buffer))
@@
-199,9
+189,9
@@
int VBoxPort::handler(void)
/*
* endpoint sends messages to the vbox port
*/
/*
* endpoint sends messages to the vbox port
*/
-int VBoxPort::message_epoint(unsigned
long
epoint_id, int message_id, union parameter *param)
+int VBoxPort::message_epoint(unsigned
int
epoint_id, int message_id, union parameter *param)
{
{
- struct
message
*message;
+ struct
lcr_msg
*message;
class Endpoint *epoint;
char filename[256], *c;
class Endpoint *epoint;
char filename[256], *c;