projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SS5: improvements
[lcr.git]
/
port.cpp
diff --git
a/port.cpp
b/port.cpp
index
98a644f
..
3dc5f68
100644
(file)
--- a/
port.cpp
+++ b/
port.cpp
@@
-148,7
+148,7
@@
struct epoint_list *Port::epointlist_new(unsigned int epoint_id)
/*
* port constructor
*/
/*
* port constructor
*/
-Port::Port(int type, const char *portname, struct port_settings *settings)
+Port::Port(int type, const char *portname, struct port_settings *settings
, struct interface *interface
)
{
class Port *temp, **tempp;
{
class Port *temp, **tempp;
@@
-159,6
+159,8
@@
Port::Port(int type, const char *portname, struct port_settings *settings)
memset(&p_settings, 0, sizeof(p_settings));
}
SCPY(p_name, portname);
memset(&p_settings, 0, sizeof(p_settings));
}
SCPY(p_name, portname);
+ if (interface)
+ SCPY(p_interface_name, interface->name);
p_tone_dir[0] = '\0';
p_type = type;
p_serial = port_serial++;
p_tone_dir[0] = '\0';
p_type = type;
p_serial = port_serial++;
@@
-177,6
+179,7
@@
Port::Port(int type, const char *portname, struct port_settings *settings)
/* call recording */
p_record = NULL;
/* call recording */
p_record = NULL;
+ p_tap = 0;
p_record_type = 0;
p_record_length = 0;
p_record_skip = 0;
p_record_type = 0;
p_record_length = 0;
p_record_skip = 0;
@@
-197,7
+200,7
@@
Port::Port(int type, const char *portname, struct port_settings *settings)
classuse++;
classuse++;
- PDEBUG(DEBUG_PORT, "new port (%d) of type 0x%x, name '%s'
\n", p_serial, type, port
name);
+ PDEBUG(DEBUG_PORT, "new port (%d) of type 0x%x, name '%s'
interface '%s'\n", p_serial, type, portname, p_interface_
name);
}
}
@@
-209,7
+212,7
@@
Port::~Port(void)
class Port *temp, **tempp;
struct lcr_msg *message;
class Port *temp, **tempp;
struct lcr_msg *message;
- PDEBUG(DEBUG_PORT, "removing port (%d) of type 0x%x, name '%s'
\n", p_serial, p_type, p
_name);
+ PDEBUG(DEBUG_PORT, "removing port (%d) of type 0x%x, name '%s'
interface '%s'\n", p_serial, p_type, p_name, p_interface
_name);
if (p_bridge) {
PDEBUG(DEBUG_PORT, "Removing us from bridge %u\n", p_bridge->bridge_id);
if (p_bridge) {
PDEBUG(DEBUG_PORT, "Removing us from bridge %u\n", p_bridge->bridge_id);
@@
-663,7
+666,7
@@
int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
char filename[256];
time_t now;
struct tm *now_tm;
char filename[256];
time_t now;
struct tm *now_tm;
- int ret;
+ int
__attribute__((__unused__))
ret;
if (!extension) {
PERROR("Port(%d) not an extension\n", p_serial);
if (!extension) {
PERROR("Port(%d) not an extension\n", p_serial);
@@
-756,7
+759,7
@@
void Port::close_record(int beep, int mute)
char *p;
struct caller_info callerinfo;
const char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
char *p;
struct caller_info callerinfo;
const char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
- int ret;
+ int
__attribute__((__unused__))
ret;
if (!p_record)
return;
if (!p_record)
return;
@@
-957,7
+960,7
@@
void Port::record(unsigned char *data, int length, int dir_fromup)
signed short *s;
int free, i, ii;
signed int sample;
signed short *s;
int free, i, ii;
signed int sample;
- int ret;
+ int
__attribute__((__unused__))
ret;
/* no recording */
if (!p_record || !length)
/* no recording */
if (!p_record || !length)
@@
-1162,6
+1165,10
@@
different_again:
}
}
+void Port::tap(unsigned char *data, int length, int dir_fromup)
+{
+}
+
void Port::update_rxoff(void)
{
}
void Port::update_rxoff(void)
{
}