X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=port.cpp;h=a05decaf50614fda7381cadcee7f6f6a46f6d7fa;hp=5998bc668c7d95ad6dfa9d9543ad8785946e157f;hb=de6346a5bf01b196a6135bff2b998615d4d8681b;hpb=6db34c1dca5c3a2acd0af689319b583ff8271dbc

diff --git a/port.cpp b/port.cpp
index 5998bc6..a05deca 100644
--- a/port.cpp
+++ b/port.cpp
@@ -54,6 +54,9 @@ class Port *port_first = NULL;
 
 unsigned int port_serial = 1; /* must be 1, because 0== no port */
 
+struct port_bridge *p_bridge_first;
+
+static void remove_bridge(struct port_bridge *bridge, class Port *port);
 
 /* free epointlist relation
  */
@@ -146,8 +149,6 @@ Port::Port(int type, const char *portname, struct port_settings *settings)
 {
 	class Port *temp, **tempp;
 
-	PDEBUG(DEBUG_PORT, "new port of type %d, name '%s'\n", type, portname);
-
 	/* initialize object */
 	if (settings)
 		memcpy(&p_settings, settings, sizeof(struct port_settings));
@@ -169,6 +170,7 @@ Port::Port(int type, const char *portname, struct port_settings *settings)
 	memset(&p_redirinfo, 0, sizeof(p_redirinfo));
 	memset(&p_capainfo, 0, sizeof(p_capainfo));
 	p_echotest = 0;
+	p_bridge = 0;
 
 	/* call recording */
 	p_record = NULL;
@@ -191,6 +193,8 @@ Port::Port(int type, const char *portname, struct port_settings *settings)
 	*tempp = this;
 
 	classuse++;
+
+ 	PDEBUG(DEBUG_PORT, "new port (%d) of type 0x%x, name '%s'\n", p_serial, type, portname);
 }
 
 
@@ -202,13 +206,18 @@ Port::~Port(void)
 	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);
+
+	if (p_bridge) {
+		PDEBUG(DEBUG_PORT, "Removing us from bridge %u\n", p_bridge->bridge_id);
+		remove_bridge(p_bridge, this);
+	}
+
 	if (p_record)
 		close_record(0, 0);
 
 	classuse--;
 
-	PDEBUG(DEBUG_PORT, "removing port of type %d, name '%s'\n", p_type, p_name);
-
 	/* disconnect port from endpoint */
 	while(p_epointlist) {
 		/* send disconnect */
@@ -292,7 +301,7 @@ void Port::set_tone(const char *dir, const char *name)
 	if (name == NULL)
 		name = "";
 
-	if (!dir && !dir[0])
+	if (!dir || !dir[0])
 		dir = options.tones_dir; /* just in case we have no PmISDN instance */
 
 	/* no counter, no eof, normal speed */
@@ -316,6 +325,8 @@ void Port::set_tone(const char *dir, const char *name)
 			SCPY(p_tone_dir, dir);
 			SCPY(p_tone_name, name);
 		}
+		/* trigger playback */
+		update_load();
 	} else {
 	 	p_tone_name[0]= '\0';
 	 	p_tone_dir[0]= '\0';
@@ -382,6 +393,8 @@ void Port::set_vbox_tone(const char *dir, const char *name)
 
 	SPRINT(p_tone_dir,  dir);
 	SPRINT(p_tone_name,  name);
+	/* trigger playback */
+	update_load();
 
 	/* now we check if the cause exists, otherwhise we use error tone. */
 	if (p_tone_dir[0]) {
@@ -585,45 +598,42 @@ try_loop:
 }
 
 
-/* port handler:
- * process transmission clock */
-int Port::handler(void)
-{
-	return(0);
-}
-
-/* endpoint sends messages to the port
- * this is called by the message_epoint inherited by child classes
- * therefor a return=1 means: stop, no more processing
+/* Endpoint sends messages to the port
+ * This is called by the message_epoint, inherited by child classes.
+ * Therefor a return 1 means: "already handled here"
  */
 //extern struct lcr_msg *dddebug;
 int Port::message_epoint(unsigned int epoint_id, int message_id, union parameter *param)
 {
 	/* check if we got audio data from one remote port */
 	switch(message_id) {
-		case MESSAGE_TONE: /* play tone */
-		PDEBUG(DEBUG_PORT, "PORT(%s) isdn port with (caller id %s) setting tone '%s' dir '%s'\n", p_name, p_callerinfo.id, param->tone.name, param->tone.dir);
+	case MESSAGE_TONE: /* play tone */
+		PDEBUG(DEBUG_PORT, "PORT(%s) setting tone '%s' dir '%s'\n", p_name, param->tone.name, param->tone.dir);
 		set_tone(param->tone.dir,param->tone.name);
-		return(1);
+		return 1;
 
-		case MESSAGE_VBOX_TONE: /* play tone of answering machine */
+	case MESSAGE_VBOX_TONE: /* play tone of answering machine */
 		PDEBUG(DEBUG_PORT, "PORT(%s) set answering machine tone '%s' '%s'\n", p_name, param->tone.dir, param->tone.name);
 		set_vbox_tone(param->tone.dir, param->tone.name);
-		return(1);
+		return 1;
 
-		case MESSAGE_VBOX_PLAY: /* play recording of answering machine */
+	case MESSAGE_VBOX_PLAY: /* play recording of answering machine */
 		PDEBUG(DEBUG_PORT, "PORT(%s) set answering machine file to play '%s' (offset %d seconds)\n", p_name, param->play.file, param->play.offset);
 		set_vbox_play(param->play.file, param->play.offset);
-		return(1);
+		return 1;
 
-		case MESSAGE_VBOX_PLAY_SPEED: /* set speed of playback (recording of answering machine) */
+	case MESSAGE_VBOX_PLAY_SPEED: /* set speed of playback (recording of answering machine) */
 		PDEBUG(DEBUG_PORT, "PORT(%s) set answering machine playback speed %d (times)\n", p_name, param->speed);
 		set_vbox_speed(param->speed);
-		return(1);
+		return 1;
 
+	case MESSAGE_BRIDGE: /* create / join / leave / destroy bridge */
+		PDEBUG(DEBUG_PORT, "PORT(%s) bridging to id %d\n", p_name, param->bridge_id);
+		bridge(param->bridge_id);
+		return 1;
 	}
 
-	return(0);
+	return 0;
 }
 
 
@@ -648,6 +658,9 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
 	/* RIFFxxxxWAVEfmt xxxx(fmt-size)dataxxxx... */
 	char dummyheader[8+4+8+sizeof(fmt)+8];
 	char filename[256];
+	time_t now;
+	struct tm *now_tm;
+	int ret;
 
 	if (!extension) {
 		PERROR("Port(%d) not an extension\n", p_serial);
@@ -676,8 +689,11 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
 
 	if (vbox == 1)
 		UPRINT(strchr(filename,'\0'), "/announcement");
-	else
+	else {
+		time(&now);
+		now_tm = localtime(&now);
 		UPRINT(strchr(filename,'\0'), "/%04d-%02d-%02d_%02d%02d%02d", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec);
+	}
 	if (vbox == 2) {
 		p_record_vbox_year = now_tm->tm_year;
 		p_record_vbox_mon = now_tm->tm_mon;
@@ -698,6 +714,7 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
 		PERROR("Port(%d) cannot record because file cannot be opened '%s'\n", p_serial, filename);
 		return(0);
 	}
+	update_rxoff();
 	fduse++;
 
 	p_record_type = type;
@@ -708,7 +725,7 @@ int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ig
 		case CODEC_MONO:
 		case CODEC_STEREO:
 		case CODEC_8BIT:
-		fwrite(dummyheader, sizeof(dummyheader), 1, p_record);
+		ret = fwrite(dummyheader, sizeof(dummyheader), 1, p_record);
 		break;
 
 		case CODEC_LAW:
@@ -736,6 +753,7 @@ void Port::close_record(int beep, int mute)
 	char *p;
 	struct caller_info callerinfo;
 	const char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
+	int ret;
 
 	if (!p_record)
 		return;
@@ -798,7 +816,7 @@ void Port::close_record(int beep, int mute)
 		}
 		i = 0;
 		while(i < beep) {
-			fwrite(beep_mono, sizeof(beep_mono), 1, p_record);
+			ret = fwrite(beep_mono, sizeof(beep_mono), 1, p_record);
 			i += sizeof(beep_mono);
 			p_record_length += sizeof(beep_mono);
 		}
@@ -858,7 +876,7 @@ void Port::close_record(int beep, int mute)
 			fmt.bits_sample = 8; /* one channel */
 			break;
 		}
-		fwrite(&fmt, sizeof(fmt), 1, p_record);
+		ret = fwrite(&fmt, sizeof(fmt), 1, p_record);
 
 		/* data */
 		fprintf(p_record, "data%c%c%c%c", (unsigned char)(size&0xff), (unsigned char)((size>>8)&0xff), (unsigned char)((size>>16)&0xff), (unsigned char)(size>>24));
@@ -882,6 +900,7 @@ void Port::close_record(int beep, int mute)
 	fclose(p_record);
 	fduse--;
 	p_record = NULL;
+	update_rxoff();
 
 	if (rename(p_record_filename, filename) < 0) {
 		PERROR("Port(%d) cannot rename from '%s' to '%s'\n", p_serial, p_record_filename, filename);
@@ -935,6 +954,7 @@ void Port::record(unsigned char *data, int length, int dir_fromup)
 	signed short *s;
 	int free, i, ii;
 	signed int sample;
+	int ret;
 
 	/* no recording */
 	if (!p_record || !length)
@@ -984,7 +1004,7 @@ same_again:
 				p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
 				i++;
 			}
-			fwrite(write_buffer, 512, 1, p_record);
+			ret = fwrite(write_buffer, 512, 1, p_record);
 			p_record_length += 512;
 			break;
 
@@ -1007,7 +1027,7 @@ same_again:
 					i++;
 				}
 			}
-			fwrite(write_buffer, 1024, 1, p_record);
+			ret = fwrite(write_buffer, 1024, 1, p_record);
 			p_record_length += 1024;
 			break;
 
@@ -1019,7 +1039,7 @@ same_again:
 				p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
 				i++;
 			}
-			fwrite(write_buffer, 512, 1, p_record);
+			ret = fwrite(write_buffer, 512, 1, p_record);
 			p_record_length += 512;
 			break;
 
@@ -1031,7 +1051,7 @@ same_again:
 				p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
 				i++;
 			}
-			fwrite(write_buffer, 256, 1, p_record);
+			ret = fwrite(write_buffer, 256, 1, p_record);
 			p_record_length += 256;
 			break;
 		}
@@ -1071,7 +1091,7 @@ different_again:
 			*s++ = sample;
 			i++;
 		}
-		fwrite(write_buffer, ii<<1, 1, p_record);
+		ret = fwrite(write_buffer, ii<<1, 1, p_record);
 		p_record_length += (ii<<1);
 		break;
 		
@@ -1094,7 +1114,7 @@ different_again:
 				i++;
 			}
 		}
-		fwrite(write_buffer, ii<<2, 1, p_record);
+		ret = fwrite(write_buffer, ii<<2, 1, p_record);
 		p_record_length += (ii<<2);
 		break;
 		
@@ -1110,7 +1130,7 @@ different_again:
 			*d++ = (sample+0x8000) >> 8;
 			i++;
 		}
-		fwrite(write_buffer, ii, 1, p_record);
+		ret = fwrite(write_buffer, ii, 1, p_record);
 		p_record_length += ii;
 		break;
 		
@@ -1126,7 +1146,7 @@ different_again:
 			*d++ = audio_s16_to_law[sample & 0xffff];
 			i++;
 		}
-		fwrite(write_buffer, ii, 1, p_record);
+		ret = fwrite(write_buffer, ii, 1, p_record);
 		p_record_length += ii;
 		break;
 	}
@@ -1139,4 +1159,139 @@ different_again:
 
 }
 
+void Port::update_rxoff(void)
+{
+}
+
+void Port::update_load(void)
+{
+}
+
+
+/*
+ * bridge handling
+ */
+
+static void remove_bridge(struct port_bridge *bridge, class Port *port)
+{
+	struct port_bridge **temp = &p_bridge_first;
+	while (*temp) {
+		if (*temp == bridge) {
+			struct port_bridge_member **memberp = &bridge->first, *member;
+
+			/* loop until we are found */
+			while(*memberp) {
+				if ((*memberp)->port == port) {
+					member = *memberp;
+					*memberp = member->next;
+					FREE(member, sizeof(struct port_bridge_member));
+					memuse--;
+					break;
+				}
+				memberp = &((*memberp)->next);
+			}
+			/* if bridge is empty, remove it */
+			if (bridge->first == NULL) {
+				PDEBUG(DEBUG_PORT, "Remove bridge %u\n", bridge->bridge_id);
+				*temp = bridge->next;
+				FREE(bridge, sizeof(struct port_bridge));
+				memuse--;
+			}
+			return;
+		}
+		temp = &((*temp)->next);
+	}
+	PERROR("Bridge %p not found in list\n", bridge);
+}
+
+void Port::bridge(unsigned int bridge_id)
+{
+	struct port_bridge_member **memberp;
+
+	/* Remove bridge, if we leave bridge or if we join a different bridge. */
+	if (p_bridge && bridge_id != p_bridge->bridge_id) {
+		PDEBUG(DEBUG_PORT, "Remove port %u from bridge %u, because out new bridge is %u\n", p_serial, p_bridge->bridge_id, bridge_id);
+		remove_bridge(p_bridge, this);
+		p_bridge = NULL;
+	}
+
+	/* if we leave bridge */
+	if (!bridge_id)
+		return;
+
+	/* find bridge */
+	if (!p_bridge) {
+		struct port_bridge *temp = p_bridge_first;
+
+		while (temp) {
+			if (temp->bridge_id == bridge_id)
+				break;
+			temp = temp->next;
+		}
+		p_bridge = temp;
+		if (p_bridge)
+			PDEBUG(DEBUG_PORT, "Port %d found existing bridge %u.\n", p_serial, p_bridge->bridge_id);
+	}
+
+	/* create bridge */
+	if (!p_bridge) {
+		struct port_bridge **temp = &p_bridge_first;
+
+		p_bridge = (struct port_bridge *) MALLOC(sizeof(struct port_bridge));
+		memuse++;
+		p_bridge->bridge_id = bridge_id;
+
+		/* attach bridge instance to list */
+		while (*temp)
+			temp = &((*temp)->next);
+		*temp = p_bridge;
+		PDEBUG(DEBUG_PORT, "Port %d creating not existing bridge %u.\n", p_serial, p_bridge->bridge_id);
+	}
+
+	/* attach to bridge */
+	memberp = &p_bridge->first;
+	while(*memberp) {
+		if ((*memberp)->port == this) {
+			/* already joined */
+			return;
+		}
+		memberp = &((*memberp)->next);
+	}
+	*memberp = (struct port_bridge_member *) MALLOC(sizeof(struct port_bridge_member));
+	memuse++;
+	(*memberp)->port = this;
+}
+
+class Port *Port::bridge_remote(void)
+{
+	class Port *remote = NULL;
+
+	/* get remote port from bridge */
+	if (!p_bridge || !p_bridge->first || !p_bridge->first->next)
+		return NULL;
+	if (p_bridge->first->port == this)
+		remote = p_bridge->first->next->port;
+	if (p_bridge->first->next->port == this)
+		remote = p_bridge->first->port;
+
+	return remote;
+}
+
+/* send data to remote Port */
+int Port::bridge_tx(unsigned char *data, int len)
+{
+	class Port *remote = bridge_remote();
+
+	if (!remote)
+		return -EINVAL;
+
+//	printf("Traffic: %u -> %u (bridge %u)\n", p_serial, remote->p_serial, p_bridge->bridge_id);
+	return remote->bridge_rx(data, len);
+}
+
+/* receive data from remote Port (dummy, needs to be inherited) */
+int Port::bridge_rx(unsigned char *data, int len)
+{
+	return 0; /* datenklo */
+}