Start passing _INPUT_ADDR and _OUTPUT_ADDR variables to notify script.

ChangeLog

@@ -4,6 +4,7 @@ xxxx-xx-xx : Version -next
  * Add --notify-wait (-9) option (not set by default). Using it prevents
    running of several notification scripts in parallel which can lead to
    races if the scripts are used for logging.
+ * Start passing _INPUT_ADDR and _OUTPUT_ADDR variables to notify script.
 
 2013-09-12 : Version 10.0
  * Add --ecm-only (-v) option. This allows processing of ECMs but without

notify-script.example

@@ -22,6 +22,8 @@ LOG_FILE="$LOGDIR/notify.${_IDENT}.notify.log"
 # Environmental vars that are set by the calling process (tsdecrypt):
 #   _TS             Unix timestamp of the event.
 #   _IDENT          tsdecrypt ident (--ident parameter).
+#   _INPUT_ADDR     Input address and port (for example 239.1.2.3:5000).
+#   _OUTPUT_ADDR    Output address and port (for example 239.9.8.7:5000).
 #   _MESSAGE_ID     Event message id (For example START, STOP, etc...).
 #   _MESSAGE_TEXT   Event message text. Human readable event message.
 #   _MESSAGE_MSG    Event message id lower cased and "_" is replaced with " "
@@ -60,6 +62,8 @@ then
 		echo "Subject: $EMAIL_SUBJECT_PREFIX ${_IDENT} ${_MESSAGE_MSG}"
 		echo "X-IDENT: ${_IDENT}"
 		echo "X-MSG-ID: ${_MESSAGE_ID}"
+		echo "X-Input: ${_INPUT_ADDR}"
+		echo "X-Output: ${_OUTPUT_ADDR}"
 		echo "X-Mailer: tsdecrypt"
 		echo
 		echo "${_IDENT} ${_MESSAGE_TEXT}"

notify.c

@@ -37,6 +37,8 @@ struct npriv {
 	char	program[512];
 	char	msg_id[512];
 	char	text[512];
+	char	input[128];
+	char	output[128];
 	int		sync;			/* Wait for message to be delivered */
 };
 
@@ -56,6 +58,8 @@ static void *do_notify(void *in) {
 		char **env = calloc(32, sizeof(char *));
 		if (asprintf(&env[e++], "_TS=%ld"			, time(NULL)) < 0) exit(EXIT_FAILURE);
 		if (asprintf(&env[e++], "_IDENT=%s"			, shared->ident) < 0) exit(EXIT_FAILURE);
+		if (asprintf(&env[e++], "_INPUT_ADDR=%s"	, shared->input) < 0) exit(EXIT_FAILURE);
+		if (asprintf(&env[e++], "_OUTPUT_ADDR=%s"	, shared->output) < 0) exit(EXIT_FAILURE);
 		if (asprintf(&env[e++], "_MESSAGE_ID=%s"	, shared->msg_id) < 0) exit(EXIT_FAILURE);
 		if (asprintf(&env[e++], "_MESSAGE_TEXT=%s"	, shared->text) < 0) exit(EXIT_FAILURE);
 		r = strlen(shared->msg_id);
@@ -153,6 +157,21 @@ static void notify_func(struct ts *ts, int sync_msg, char *msg_id, char *msg_tex
 	strncpy(np->text, msg_text, sizeof(np->text) - 1);
 	np->text[sizeof(np->text) - 1] = 0;
 
+	if (ts->input.type == NET_IO) {
+		snprintf(np->input, sizeof(np->input), "%s:%s", ts->input.hostname, ts->input.service);
+	} else if (ts->input.type == FILE_IO) {
+		snprintf(np->input, sizeof(np->input), "%s", ts->input.fd == 0 ? "STDIN" : "FILE");
+	}
+	if (ts->output_stream) {
+		if (ts->output.type == NET_IO) {
+			snprintf(np->output, sizeof(np->output), "%s:%s", ts->output.hostname, ts->output.service);
+		} else if (ts->output.type == FILE_IO) {
+			snprintf(np->output, sizeof(np->output), "%s", ts->output.fd == 1 ? "STDOUT" : "FILE");
+		}
+	} else {
+		snprintf(np->output, sizeof(np->output), "DISABLED");
+	}
+
 	queue_add(ts->notify->notifications, np);
 }
 

tsdecrypt.1

@@ -340,6 +340,8 @@ before executing the external notification program. The variables are:
 
   \fB_TS\fR             Unix timestamp of the event.
   \fB_IDENT\fR          tsdecrypt ident parameter with "/" replaced by "\-".
+  \fB_INPUT_ADDR\fR     Input address and port (for example 239.1.2.3:5000)
+  \fB_OUTPUT_ADDR\fR    Output address and port (for example 239.9.8.7:5000)
   \fB_MESSAGE_ID\fR     Event message id (for example START, STOP, etc...).
   \fB_MESSAGE_MSG\fR    Event message id with "_" replaced by " ".
   \fB_MESSAGE_TEXT\fR   Event message text. Human readable event message.