File 0010-Introduce-ioctl-for-simulating-alarms-unde... of Package dahdi-linux

Overview Repositories Revisions Requests Users Attributes Meta

File 0010-Introduce-ioctl-for-simulating-alarms-under-userspac.patch of Package dahdi-linux (Revision 66c6a1d4db9118e829cf5d38022dcb13)

Currently displaying revision 66c6a1d4db9118e829cf5d38022dcb13 , Show latest

From 7890bc14ee09cc5aeff4da6ba782518d8bd997b4 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Fri, 20 Nov 2020 09:33:22 +0100
Subject: [PATCH 10/10] Introduce ioctl() for simulating alarms under userspace
 control

For automatic testing scenarios, it is very useful to be able to
artificially create line alarms.  This allows testing of the whole
stack through DAHDI itself, DAHDI-interfaces in applications and
actual applications.

It introduces a new DAHDI_SIMULATE_ALARM ioctl() whcih has to be
issued on /dev/dahdi/ctl and which can be used to set or remove
any simulated alarms on the given span.
---
 drivers/dahdi/dahdi-base.c    |  1 +
 drivers/dahdi/dahdi_dynamic.c | 31 +++++++++++++++++++++++++++++--
 include/dahdi/kernel.h        |  1 +
 include/dahdi/user.h          |  8 ++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 69c339e..5cab8ff 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -5585,6 +5585,7 @@ dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 		return dahdi_ioctl_maint(data);
 	case DAHDI_DYNAMIC_CREATE:
 	case DAHDI_DYNAMIC_DESTROY:
+	case DAHDI_SIMULATE_ALARM:
 		return dahdi_ioctl_dynamic(cmd, data);
 	case DAHDI_EC_LICENSE_CHALLENGE:
 	case DAHDI_EC_LICENSE_RESPONSE:
diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c
index b1df408..6643441 100644
--- a/drivers/dahdi/dahdi_dynamic.c
+++ b/drivers/dahdi/dahdi_dynamic.c
@@ -366,7 +366,7 @@ void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msgl
 	rcu_read_unlock();
 
 	/* Check for Yellow alarm */
-	newalarm = span->alarms & ~(DAHDI_ALARM_YELLOW | DAHDI_ALARM_RED);
+	newalarm = dtd->simulated_alarms | (span->alarms & ~(DAHDI_ALARM_YELLOW | DAHDI_ALARM_RED));
 	if (sflags & DAHDI_DYNAMIC_FLAG_YELLOW_ALARM)
 		newalarm |= DAHDI_ALARM_YELLOW;
 
@@ -745,9 +745,31 @@ static void dahdi_dynamic_flush_tasklet(unsigned long data)
 }
 #endif
 
+static int simulate_alarm(const struct dahdi_simulate_alarm *dsa)
+{
+	struct dahdi_dynamic *d;
+
+	rcu_read_lock();
+
+	list_for_each_entry_rcu(d, &dspan_list, list) {
+		if (d->span.spanno == dsa->spanno) {
+			/* mask off old simulated alarms */
+			d->span.alarms &= ~d->simulated_alarms;
+			d->simulated_alarms = dsa->alarms;
+			/* mask in new simulated alarms */
+			d->span.alarms |= d->simulated_alarms;
+			dahdi_alarm_notify(&d->span);
+			return 0;
+		}
+	}
+
+	return -ENODEV;
+}
+
 static int dahdi_dynamic_ioctl(unsigned int cmd, unsigned long data)
 {
 	struct dahdi_dynamic_span dds;
+	struct dahdi_simulate_alarm dsa;
 	int res;
 	switch(cmd) {
 	case DAHDI_DYNAMIC_CREATE:
@@ -771,6 +793,11 @@ static int dahdi_dynamic_ioctl(unsigned int cmd, unsigned long data)
 		if (debug)
 			printk(KERN_DEBUG "Dynamic Destroy\n");
 		return destroy_dynamic(&dds);
+	case DAHDI_SIMULATE_ALARM:
+		if (copy_from_user(&dsa, (__user const void *)data,
+				   sizeof(dsa)))
+			return -EFAULT;
+		return simulate_alarm(&dsa);
 	}
 
 	return -ENOTTY;
@@ -839,7 +866,7 @@ static void check_for_red_alarm(TIMER_DATA_TYPE unused)
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(d, &dspan_list, list) {
-		newalarm = d->span.alarms & ~DAHDI_ALARM_RED;
+		newalarm = d->simulated_alarms | (d->span.alarms & ~DAHDI_ALARM_RED);
 		/* If nothing received for a second, consider that RED ALARM */
 		if ((jiffies - d->rxjif) > 1 * HZ) {
 			newalarm |= DAHDI_ALARM_RED;
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index 507b2f3..94f265f 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -1068,6 +1068,7 @@ struct dahdi_dynamic {
 	int master;
 	unsigned char *msgbuf;
 	struct device *dev;
+	int simulated_alarms;
 
 	struct list_head list;
 };
diff --git a/include/dahdi/user.h b/include/dahdi/user.h
index 68e72e0..d69dc91 100644
--- a/include/dahdi/user.h
+++ b/include/dahdi/user.h
@@ -1025,6 +1025,14 @@ struct dahdi_dynamic_span {
  */
 #define DAHDI_DYNAMIC_DESTROY		_IOW(DAHDI_CODE, 81, struct dahdi_dynamic_span)
 
+
+struct dahdi_simulate_alarm {
+	int spanno;
+	int alarms;
+};
+/* simulate alarms on a dynamic span */
+#define DAHDI_SIMULATE_ALARM		_IOW(DAHDI_CODE, 82, struct dahdi_simulate_alarm)
+
 /*
  * Set the HW gain for a device
  */
-- 
2.29.2

Places

File 0010-Introduce-ioctl-for-simulating-alarms-under-userspac.patch of Package dahdi-linux (Revision 66c6a1d4db9118e829cf5d38022dcb13)

Places