August 2023 - gerrit-log - lists.osmocom.org

[M] Change in dahdi-linux[master]: trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34012 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP ...................................................................... trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP Using those maintenance modes we can test the local (DAHDI channel) and remote (trunkdev) sides indepdendent from each other. Change-Id: I12cf9647fb6def38865aaac8ad6bbb58ebf7b5fd --- M drivers/dahdi/trunkdev/trunkdev.c 1 file changed, 64 insertions(+), 8 deletions(-) Approvals: manawyrm: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/drivers/dahdi/trunkdev/trunkdev.c b/drivers/dahdi/trunkdev/trunkdev.c index 1163849..6518109 100644 --- a/drivers/dahdi/trunkdev/trunkdev.c +++ b/drivers/dahdi/trunkdev/trunkdev.c @@ -161,6 +161,35 @@ return 0; } +static const char *maint2str(int cmd) +{ + switch (cmd) { + case DAHDI_MAINT_NONE: return "NONE"; + case DAHDI_MAINT_LOCALLOOP: return "LOCALLOOP"; + case DAHDI_MAINT_NETWORKPAYLOADLOOP: return "NETWORKPAYLOADLOOP"; + default: return "UNKNOWN"; + } +} + +static int td_d_maint(struct dahdi_span *span, int cmd) +{ + struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + + switch (cmd) { + case DAHDI_MAINT_NONE: + case DAHDI_MAINT_LOCALLOOP: + case DAHDI_MAINT_NETWORKPAYLOADLOOP: + /* we don't need to do anything, as span->maintstat is set by the core, + * just acknowledge those supported modes here */ + dev_info(&td->dahdi.dev->dev, "Setting maintenance mode to: %s\n", maint2str(cmd)); + break; + default: + return -ENOSYS; + } + return 0; +} + + /* called in hard_irq context with chan_lock held */ static void td_d_sync_tick(struct dahdi_span *span, int is_master) { @@ -178,14 +207,29 @@ uint8_t frame[32]; int rc; - /* Trunk -> DAHDI direction */ - rc = frame_fifo_out(&td->from_trunk, frame); - if (rc >= 0) - _span_demux_one_frame(td, frame); + switch (span->maintstat) { + case DAHDI_MAINT_NONE: + /* Trunk -> DAHDI direction */ + rc = frame_fifo_out(&td->from_trunk, frame); + if (rc >= 0) + _span_demux_one_frame(td, frame); - /* Trunk <- DAHDI direction */ - _span_mux_one_frame(td, frame); - frame_fifo_in(&td->to_trunk, frame); + /* Trunk <- DAHDI direction */ + _span_mux_one_frame(td, frame); + frame_fifo_in(&td->to_trunk, frame); + break; + case DAHDI_MAINT_LOCALLOOP: + /* Loop frame from DAHDI back to itself */ + _span_mux_one_frame(td, frame); + _span_demux_one_frame(td, frame); + break; + case DAHDI_MAINT_NETWORKPAYLOADLOOP: + /* Loop frame from trunkdev back to itself */ + rc = frame_fifo_out(&td->from_trunk, frame); + if (rc >= 0) + frame_fifo_in(&td->to_trunk, frame); + break; + } } /* wake up any processes doing blocking read or waiting in poll */ wake_up_interruptible(&td->waitq); @@ -197,7 +241,7 @@ .chanconfig = td_d_chanconfig, .startup = td_d_startup, .shutdown = td_d_shutdown, - //.maint = td_d_maint, + .maint = td_d_maint, .sync_tick = td_d_sync_tick, }; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I12cf9647fb6def38865aaac8ad6bbb58ebf7b5fd Gerrit-Change-Number: 34012 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in libosmo-sccp[master]: ss7: Use libosmo-netif's osmo_stream_{cli,srv}_recv() APIs

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34089 ) Change subject: ss7: Use libosmo-netif's osmo_stream_{cli,srv}_recv() APIs ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > the patch you're referring-to has not yet been merged ACk, we have to wait until it is merged. > Also, at the very least I would expect a TODO-RELEASE update It is there, you may have overlooked it 😊 > To me, this kind of change *might* even rectify bumping the libversion of libosmo-netif The related change of libosmo-netif osmo_stream_cli now providing the SCTP_NOTIFICATIONS like osmo_srv already does is backward compatible (old users don't need to be rebuilt), because the SCTP_NTOIFICATIONS flagd are only provided upon return code -EAGAIN or 0, so it shouldn't make major problems on apps. Once this libosmo-sccp is released, it will depend on package libosmo-netif > 1.3.0 which will have such feature, so the problem is really during master which will be released over next weeks. And whoever uses master mixed with "latest" should know what he's doing. So I don't think it's strictly needed to bump libversion on libosmo-netif since users don't require rebuild (no ABI breakage), and libosmo-sccp configure.ac dependencies should be enough in principle to avoid using older libosmo-netif. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If3d78b636e8e224aa9c8597d0b242e29d3e3c84e Gerrit-Change-Number: 34089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Aug 2023 16:00:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years

1
0
0 0

[L] Change in dahdi-linux[master]: Introduce virtual DAHDI trunk device

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34010 ) Change subject: Introduce virtual DAHDI trunk device ...................................................................... Introduce virtual DAHDI trunk device This virtual trunk device is a new character device. Contrary to the per-channel devices, this is a per-span device for virtual E1 spans. Userspace reads and writes 32-byte E1 frames on it. ioctl's are added to create and delete such virtual trunk devices at runtime. Each virtual trunk device is limited to one span. Opening trunkdev is similar to opening channels via /dev/dahdi/chan works: All users open the same generic device node but then issue an ioctl to specify which (named) trundev they actually want to open. This avoids having to dynamically register minor device ids, creating device nodes, etc. The trunkdev is in RED + LOS alarm after creation. Only once a userspace process opens the E1 frame side, those alarms cease. Change-Id: Iffd9a1a09d835b29927acd374364cab56745fb74 --- M drivers/dahdi/Kbuild M drivers/dahdi/Kconfig M drivers/dahdi/dahdi-base.c A drivers/dahdi/trunkdev/Kbuild A drivers/dahdi/trunkdev/frame_fifo.c A drivers/dahdi/trunkdev/frame_fifo.h A drivers/dahdi/trunkdev/trunkdev.c M include/dahdi/kernel.h M include/dahdi/user.h 9 files changed, 939 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified manawyrm: Verified diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 3332bf6..c3ec58e 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -6,6 +6,8 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETHMF) += dahdi_dynamic_ethmf.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRANSCODE) += dahdi_transcode.o +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRUNKDEV) += trunkdev/ + ifdef CONFIG_USB obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ICE1USB) += icE1usb/ endif diff --git a/drivers/dahdi/Kconfig b/drivers/dahdi/Kconfig index e8f33b0..14c49bd 100644 --- a/drivers/dahdi/Kconfig +++ b/drivers/dahdi/Kconfig @@ -262,6 +262,24 @@ If unsure, say Y. +config DAHDI_TRUNKDEV + tristate "Virtual trunk device support" + depends on DAHDI + default DAHDI + ---help--- + This driver provides support for spans via a virtual trunk device. + In this driver, DAHDI basically only acts as a compability layer to + multiplex and de-multiplex samples from the individual channels + (timeslots) to/from E1 frames, which are provided/consumed from a + new /dev/dahdi/trunkdev character device. Actual interfacing with + real or physical hardware is then performed by some userspace process. + + To compile this driver as a module, choose M here: the + module will be called dahdi-trunkdev. + + If unsure, say Y. + + source "drivers/dahdi/xpp/Kconfig" diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 7bcbda6..d8e6268 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -105,6 +105,7 @@ #define UNIT(file) MINOR(file->f_path.dentry->d_inode->i_rdev) EXPORT_SYMBOL(dahdi_transcode_fops); +EXPORT_SYMBOL(dahdi_trunkdev_fops); EXPORT_SYMBOL(dahdi_init_tone_state); EXPORT_SYMBOL(dahdi_mf_tone); EXPORT_SYMBOL(__dahdi_mulaw); @@ -181,6 +182,7 @@ static struct dahdi_span *master_span; struct file_operations *dahdi_transcode_fops = NULL; +struct file_operations *dahdi_trunkdev_fops = NULL; #ifdef CONFIG_DAHDI_CONFLINK @@ -524,6 +526,30 @@ return found; } +static struct dahdi_span *_find_span_by_name(const char *name) +{ + struct dahdi_span *s; + list_for_each_entry(s, &span_list, spans_node) { + if (!strcmp(s->name, name)) { + return s; + } + } + return NULL; +} + +struct dahdi_span *dahdi_span_find_by_name_and_get(const char *name) +{ + struct dahdi_span *found; + + mutex_lock(&registration_mutex); + found = _find_span_by_name(name); + if (found && !get_span(found)) + found = NULL; + mutex_unlock(&registration_mutex); + return found; +} +EXPORT_SYMBOL(dahdi_span_find_by_name_and_get); + static unsigned int span_count(void) { unsigned int count = 0; @@ -3328,6 +3354,24 @@ } return -ENXIO; } + if (unit == DAHDI_TRUNKDEV) { + if (!dahdi_trunkdev_fops) { + if (request_module("dahdi_trunkdev")) { + return -ENXIO; + } + } + if (!try_module_get(dahdi_trunkdev_fops->owner)) { + return -ENXIO; + } + if (dahdi_trunkdev_fops && dahdi_trunkdev_fops->open) { + return dahdi_trunkdev_fops->open(inode, file); + } else { + /* dahdi_trunkdev module should have exported a + * file_operations table. */ + WARN_ON(1); + } + return -ENXIO; + } if (unit == DAHDI_TIMER) { if (can_open_timer()) { return dahdi_timer_open(file); diff --git a/drivers/dahdi/trunkdev/Kbuild b/drivers/dahdi/trunkdev/Kbuild new file mode 100644 index 0000000..934153b --- /dev/null +++ b/drivers/dahdi/trunkdev/Kbuild @@ -0,0 +1,3 @@ +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRUNKDEV) += dahdi-trunkdev.o + +dahdi-trunkdev-objs := trunkdev.o frame_fifo.o diff --git a/drivers/dahdi/trunkdev/frame_fifo.c b/drivers/dahdi/trunkdev/frame_fifo.c new file mode 100644 index 0000000..19b6dba --- /dev/null +++ b/drivers/dahdi/trunkdev/frame_fifo.c @@ -0,0 +1,158 @@ +/* + * frame_fifo.c (copied from osmo-e1d) + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/types.h> +#include <linux/errno.h> +#include <linux/string.h> + +#include "frame_fifo.h" + + +/*********************************************************************** + * Frame FIFO + ***********************************************************************/ + +void fifo_dump(struct frame_fifo *fifo) +{ + printk(KERN_DEBUG "buf=%p, size=%zu, next_in=%lu, next_out=%lu\n", fifo->buf, sizeof(fifo->buf), + fifo->next_in - fifo->buf, fifo->next_out - fifo->buf); +} + +/*! Initialize a frame FIFO. + * \param fifo Caller-allocated memory for FIFO data structure + * \param threshold After how many available frames shall we call threshold_cb + * \param threshold_cb Optional call-back to call whenever FIFO contains more than 'threshold' frames + * \param priv Opaque pointer passed to threshold_cb */ +void frame_fifo_init(struct frame_fifo *fifo, unsigned int threshold, + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv), + void *priv) +{ + memset(fifo->buf, 0xff, sizeof(fifo->buf)); + fifo->next_in = fifo->buf; + fifo->next_out = fifo->buf; + fifo->threshold = threshold; + fifo->threshold_cb = threshold_cb; + fifo->priv = priv; + spin_lock_init(&fifo->lock); +} + +#define FIFO_BUF_END(f) ((f)->buf + sizeof((f)->buf)) + +/*! put one received frames into the FIFO. + * \param fifo The FIFO to which we want to put (append) multiple frames + * \param frame Pointer to memory containing the frame data + * \param count Number of frames to put into FIFO. + * \returns 0 on success; -1 on error (overflow */ +int frame_fifo_in(struct frame_fifo *fifo, const uint8_t *frame) +{ + unsigned long flags; + + spin_lock_irqsave(&fifo->lock, flags); +#if 0 + /* FIXME: detect overflow */ + if (fifo->next_in == fifo->next_out) { + spin_unlock_irqrestore(&fifo->lock, flags); + return -ENOSPC; + } +#endif + BUG_ON(fifo->next_in + BYTES_PER_FRAME > FIFO_BUF_END(fifo)); + memcpy(fifo->next_in, frame, BYTES_PER_FRAME); + fifo->next_in += BYTES_PER_FRAME; + if (fifo->next_in >= FIFO_BUF_END(fifo)) + fifo->next_in -= sizeof(fifo->buf); + spin_unlock_irqrestore(&fifo->lock, flags); + + if (fifo->threshold_cb) { + unsigned int frames_avail = frame_fifo_frames(fifo); + if (frames_avail >= fifo->threshold) + fifo->threshold_cb(fifo, frames_avail, fifo->priv); + } + + return 0; +} + +/*! put (append) multiple received frames into the FIFO. + * \param fifo The FIFO to which we want to put (append) multiple frames + * \param frame Pointer to memory containing the frame data + * \param count Number of frames to put into FIFO. + * \returns Number of frames actually put to FIFO; can be less than 'count' */ +int frame_fifo_in_multi(struct frame_fifo *fifo, const uint8_t *frame, size_t count) +{ + const uint8_t *cur = frame; + unsigned int i; + int rc; + + for (i = 0; i < count; i++) { + rc = frame_fifo_in(fifo, cur); + /* abort on the first failing frame, there's no point in trying further */ + if (rc < 0) + return (int) i; + cur += BYTES_PER_FRAME; + } + return (int) i; +} + +/*! pull one frames out of the FIFO. + * \param fifo The FIFO from which we want to pull frames + * \param out Caller-allocated output buffer + * \returns 0 on success; -1 on error (no frame available) */ +int frame_fifo_out(struct frame_fifo *fifo, uint8_t *out) +{ + unsigned long flags; + + spin_lock_irqsave(&fifo->lock, flags); + + if (__frame_fifo_frames(fifo) < 1) { + spin_unlock_irqrestore(&fifo->lock, flags); + return -1; + } + + memcpy(out, fifo->next_out, BYTES_PER_FRAME); + fifo->next_out += BYTES_PER_FRAME; + + if (fifo->next_out >= FIFO_BUF_END(fifo)) + fifo->next_out -= sizeof(fifo->buf); + + spin_unlock_irqrestore(&fifo->lock, flags); + + return 0; +} + +/*! pull multiple frames out of the FIFO. + * \param fifo The FIFO from which we want ot pull frames + * \param out Caller-allocated output buffer + * \param count Number of frames to pull + * \returns number of frames pulled; can be 0 or less than count */ +int frame_fifo_out_multi(struct frame_fifo *fifo, uint8_t *out, size_t count) +{ + uint8_t *cur = out; + unsigned int i; + int rc = 0; + + for (i = 0; i < count; i++) { + rc = frame_fifo_out(fifo, cur); + /* if there's no data in the FIFO, return number of frames + * pulled so far, could be 0. */ + if (rc < 0) + return (int) i; + cur += BYTES_PER_FRAME; + } + return (int) i; +} diff --git a/drivers/dahdi/trunkdev/frame_fifo.h b/drivers/dahdi/trunkdev/frame_fifo.h new file mode 100644 index 0000000..af02811 --- /dev/null +++ b/drivers/dahdi/trunkdev/frame_fifo.h @@ -0,0 +1,56 @@ +#pragma once + +#include <linux/spinlock.h> + +#define BYTES_PER_FRAME 32 +#define FRAMES_PER_FIFO 800 /* 100ms @ 8000 frames per second */ + +struct frame_fifo { + spinlock_t lock; + uint8_t *next_in; /* where to write next input into FIFO */ + uint8_t *next_out; /* where to read next output from FIFO */ + uint8_t threshold; /* number of frames that should trigger */ + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv); + void *priv; + + uint8_t buf[BYTES_PER_FRAME * FRAMES_PER_FIFO]; +}; + +void frame_fifo_init(struct frame_fifo *fifo, unsigned int threshold, + void (*threshold_cb)(struct frame_fifo *fifo, unsigned int frames, void *priv), + void *priv); + +/* number of frames currently available in FIFO */ +static inline unsigned int __frame_fifo_frames(struct frame_fifo *fifo) +{ + return ((fifo->next_in + sizeof(fifo->buf) - fifo->next_out) % sizeof(fifo->buf)) / BYTES_PER_FRAME; +} +static inline unsigned int frame_fifo_frames(struct frame_fifo *fifo) +{ + unsigned long flags; + unsigned int ret; + + spin_lock_irqsave(&fifo->lock, flags); + ret = __frame_fifo_frames(fifo); + spin_unlock_irqrestore(&fifo->lock, flags); + + return ret; +} + +/* for how many frames do we have space in the FIFO? */ +static inline unsigned int frame_fifo_space(struct frame_fifo *fifo) +{ + return FRAMES_PER_FIFO - frame_fifo_frames(fifo); +} + +/* put a received frame into the FIFO */ +int frame_fifo_in(struct frame_fifo *fifo, const uint8_t *frame); + +/* put multiple received frames into the FIFO */ +int frame_fifo_in_multi(struct frame_fifo *fifo, const uint8_t *frame, size_t count); + +/* pull one frame out of the FIFO */ +int frame_fifo_out(struct frame_fifo *fifo, uint8_t *out); + +/* pull multiple frames out of the FIFO */ +int frame_fifo_out_multi(struct frame_fifo *fifo, uint8_t *out, size_t count); diff --git a/drivers/dahdi/trunkdev/trunkdev.c b/drivers/dahdi/trunkdev/trunkdev.c new file mode 100644 index 0000000..5569888 --- /dev/null +++ b/drivers/dahdi/trunkdev/trunkdev.c @@ -0,0 +1,607 @@ +/* DAHDI Virtual Trunk device driver. + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * for Osmocom retronetworking project + * + */ + +/* This virtual trunk device is a new character device. Contrary to + the per-channel devices, this is a per-span device for virtual E1 + spans. Userspace reads and writes 32-byte E1 frames on it. + + ioctl's are added to create and delete such virtual trunk devices + at runtime. Each virtual trunk device is limited to one span. + + Opening trunkdev is similar to opening channels via /dev/dahd/chanw + works: All users open the same generic device node but then issue + an ioctl to specify which (named) trundev they actually want to open. + + This avoids having to dynamically register minor device ids, creating + device nodes, etc. + + The trunkdev is in RED + LOS alarm after creation. Only once a userspace + process opens the E1 frame side, those alarms cease. +*/ + + +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kmod.h> +#include <linux/wait.h> +#include <linux/spinlock.h> + +#include <dahdi/kernel.h> + +#include "frame_fifo.h" +#include "../dahdi.h" + +#define TRUNKDEV_FMT "trunkdev/%s/0" + +#define ALL_RY_ALARMS (DAHDI_ALARM_RED | DAHDI_ALARM_YELLOW | \ + DAHDI_ALARM_LFA | DAHDI_ALARM_LMFA) + +struct dahdi_trunkdev { + /* pointer to 'file' _if_ somebody has opened us via DAHDI_TRUNKDEV_OPEM */ + struct file *file; + + /* the two E1 frame FIFOs between trunk-device and DAHDI code */ + struct frame_fifo from_trunk; + struct frame_fifo to_trunk; + + /* wait-queue for blocking read on trunk device */ + wait_queue_head_t waitq; + + struct { + struct dahdi_device *dev; + struct dahdi_span span; + struct dahdi_chan *chans[31]; + /* [next rx byte] offset into chan[i]->readchunk */ + unsigned int readchunk_idx; + /* [next tx byte] offset into chan[i]->writechunk */ + unsigned int writechunk_idx; + } dahdi; +}; + +/* process one incoming E1 frame (32 bytes; one for each TS) */ +static void _span_demux_one_frame(struct dahdi_trunkdev *td, const uint8_t *data) +{ + struct dahdi_span *dspan = &td->dahdi.span; + unsigned int i; + + /* TODO: TS0 handling */ + + /* de-multiplex one byte to each channel */ + for (i = 0; i < ARRAY_SIZE(td->dahdi.chans); i++) { + struct dahdi_chan *chan = td->dahdi.chans[i]; + chan->readchunk[td->dahdi.readchunk_idx] = data[1+i]; + } + td->dahdi.readchunk_idx++; + + /* DAHDI_CHUNKSIZE is 8, meaning every channel (timeslot) wants data for 8 + * bytes (PCM samples) every time _dahdi_receive() is called */ + if (td->dahdi.readchunk_idx == DAHDI_CHUNKSIZE) { + dahdi_receive(dspan); + td->dahdi.readchunk_idx = 0; + } +} + +/* multiplex one E1 frame (32 bytes) and write it to 'out' */ +static void _span_mux_one_frame(struct dahdi_trunkdev *td, uint8_t *out) +{ + struct dahdi_span *dspan = &td->dahdi.span; + unsigned int i; + + out[0] = 0; /* TODO: TS0 handling */ + + /* multiplex one byte of each channel into a frame */ + for (i = 0; i < ARRAY_SIZE(td->dahdi.chans); i++) { + struct dahdi_chan *chan = td->dahdi.chans[i]; + out[1+i] = chan->writechunk[td->dahdi.writechunk_idx]; + } + td->dahdi.writechunk_idx++; + + /* DAHDI_CHUNKSIZE is 8, meaning every channel (timeslot) has data for 8 + * bytes (PCM samples) every time _dahdi_transmit() is called */ + if (td->dahdi.writechunk_idx == DAHDI_CHUNKSIZE) { + dahdi_transmit(dspan); + td->dahdi.writechunk_idx = 0; + } +} + + + + +/************************************************************************* + * DAHDI driver integration + *************************************************************************/ + +/* configuration of the span itself */ +static int td_d_spanconfig(struct file *file, struct dahdi_span *span, + struct dahdi_lineconfig *lc) +{ + struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + unsigned int i; + + if (lc->sync < 0) + lc->sync = 0; + if (lc->sync > 1) { + // TODO: log + lc->sync = 0; + } + + /* (re-)set some sane defaults */ + for (i = 0; i < span->channels; i++) { + struct dahdi_chan *const chan = td->dahdi.chans[i]; + chan->sigcap = DAHDI_SIG_CLEAR | DAHDI_SIG_MTP2 | DAHDI_SIG_SF; + } + + return 0; +} + +/* configuration of a single channel within the span */ +static int td_d_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype) +{ + return 0; +} + +/* start the span */ +static int td_d_startup(struct file *file, struct dahdi_span *span) +{ + //struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + /* TODO: set alarms if trunkdev not open? */ + return 0; +} + +/* shut down / stop the span */ +static int td_d_shutdown(struct dahdi_span *span) +{ + //struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + /* TODO: should trunkdev continue to read/write even if the dahdi side is shutdown */ + return 0; +} + +/* called in hard_irq context with chan_lock held */ +static void td_d_sync_tick(struct dahdi_span *span, int is_master) +{ + struct dahdi_trunkdev *td = container_of(span, struct dahdi_trunkdev, dahdi.span); + unsigned int i; + + /* we must have some other clock source than this span, due to the way + * how DAHDI works internally: This very sync_tick function is called when the + * master device receives data via _dahdi_receive(). As we are calling + * _dahdi_receive() via _span_demux_one_frame(), this would lead to re-entrancy */ + BUG_ON(is_master); + + /* trigger transmission + reception of E1 frames */ + for (i = 0; i < DAHDI_CHUNKSIZE; i++) { + uint8_t frame[32]; + int rc; + + /* Trunk -> DAHDI direction */ + rc = frame_fifo_out(&td->from_trunk, frame); + if (rc >= 0) + _span_demux_one_frame(td, frame); + + /* Trunk <- DAHDI direction */ + _span_mux_one_frame(td, frame); + frame_fifo_in(&td->to_trunk, frame); + } + /* wake up any processes doing blocking read or waiting in poll */ + wake_up_interruptible(&td->waitq); +} + +static const struct dahdi_span_ops trunkdev_span_ops = { + .owner = THIS_MODULE, + .spanconfig = td_d_spanconfig, + .chanconfig = td_d_chanconfig, + .startup = td_d_startup, + .shutdown = td_d_shutdown, + //.maint = td_d_maint, + .sync_tick = td_d_sync_tick, +}; + + +static void trunkdev_free_channels(struct dahdi_trunkdev *td) +{ + unsigned int i; + for (i = 0; i < ARRAY_SIZE(td->dahdi.chans); i++) { + kfree(td->dahdi.chans[i]); + td->dahdi.chans[i] = NULL; + } +} + +static int trunkdev_alloc_channels(struct dahdi_trunkdev *td) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(td->dahdi.chans); i++) { + struct dahdi_chan *chan; + kfree(td->dahdi.chans[i]); + chan = td->dahdi.chans[i] = kzalloc(sizeof(*chan), GFP_KERNEL); + if (!chan) { + trunkdev_free_channels(td); + return -ENOMEM; + } + chan->pvt = td; + snprintf(chan->name, sizeof(chan->name)-1, "%s/%u", + td->dahdi.span.name, i+1); + chan->chanpos = i+1; + chan->sigcap = DAHDI_SIG_CLEAR | DAHDI_SIG_MTP2 | DAHDI_SIG_SF; + } + return 0; +} + +static int trunkdev_create(const char *name) +{ + struct dahdi_trunkdev *td; + struct dahdi_device *ddev; + struct dahdi_span *dspan; + int ret = -EINVAL; + int rc; + + td = kzalloc(sizeof(*td), GFP_KERNEL); + if (!td) + return -ENOMEM; + + frame_fifo_init(&td->from_trunk, 0, NULL, td); + frame_fifo_init(&td->to_trunk, 0, NULL, td); + init_waitqueue_head(&td->waitq); + + td->dahdi.dev = dahdi_create_device(); + if (!td->dahdi.dev) { + printk(KERN_ERR "Error in dahdi_create_device()\b"); + goto error; + } + ddev = td->dahdi.dev; + dev_set_name(&ddev->dev, "trunkdev_%s", name); + ddev->manufacturer = "Osmocom"; + ddev->devicetype = "Virtual Trunk"; + ddev->hardware_id = "none"; + //ddev->location = FIXME; + + dspan = &td->dahdi.span; + snprintf(dspan->name, sizeof(dspan->name), TRUNKDEV_FMT, name); + snprintf(dspan->desc, sizeof(dspan->desc), "Virtual trunk %s span 0", name); + dspan->channels = 31; + dspan->spantype = SPANTYPE_DIGITAL_E1; + dspan->deflaw = DAHDI_LAW_ALAW; + dspan->linecompat = DAHDI_CONFIG_HDB3 | DAHDI_CONFIG_CCS | DAHDI_CONFIG_CRC4; + dspan->alarms = DAHDI_ALARM_RED | DAHDI_ALARM_LOS; + dspan->chans = td->dahdi.chans; + dspan->flags = 0; + dspan->offset = 0; + dspan->ops = &trunkdev_span_ops; + dspan->cannot_provide_timing = 1; + + rc = trunkdev_alloc_channels(td); + if (rc) { + ret = -ENOMEM; + goto err_free_tdev; + } + + list_add_tail(&dspan->device_node, &ddev->spans); + + rc = dahdi_register_device(td->dahdi.dev, NULL); + if (rc) { + printk(KERN_ERR "Error in dahdi_register_device()\n"); + goto err_free_chans; + } + + return dspan->spanno; + +err_free_chans: + trunkdev_free_channels(td); +err_free_tdev: + dahdi_free_device(td->dahdi.dev); +error: + kfree(td); + return ret; +} + +static void trunkdev_free(struct dahdi_trunkdev *td) +{ + if (td->file) + td->file->private_data = NULL; + + /* will in turn call td_d_shutdown() */ + dahdi_unregister_device(td->dahdi.dev); + trunkdev_free_channels(td); + kfree(td); +} + + +/************************************************************************* + * /dev/dahdi/trunkdev character device handling for a full trunk + *************************************************************************/ + +/* user has opened a trunkdev device */ +static int dahdi_trunkdev_open(struct inode *inode, struct file *file) +{ + const struct file_operations *original_fops; + + printk(KERN_DEBUG "%s\n", __func__); + + /* use our own file operations for this file, not the generic dahdi ones */ + original_fops = file->f_op; + file->f_op = dahdi_trunkdev_fops; + file->private_data = NULL; + /* Under normal operation, this releases the reference on the DAHDI + * module that was created when the file was opened. dahdi_open is + * responsible for taking a reference out on this module before + * calling this function. */ + module_put(original_fops->owner); + + /* nothing else to do here, we wait for ioctls() to create new trunkdev + * or to associate the file handle with existing ones */ + return 0; +} + +/* user has closed the trunkdev device */ +static int dahdi_trunkdev_release(struct inode *inode, struct file *file) +{ + struct dahdi_trunkdev *td = file->private_data; + struct dahdi_span *dspan; + unsigned long flags; + + printk(KERN_DEBUG "%s\n", __func__); + + if (unlikely(!td)) + return -ENXIO; + + dspan = &td->dahdi.span; + /* signal RED alarm once the trunkdev user is gone */ + spin_lock_irqsave(&dspan->lock, flags); + dspan->alarms &= ~ALL_RY_ALARMS; + dspan->alarms |= DAHDI_ALARM_RED | DAHDI_ALARM_LOS; + dahdi_alarm_notify(dspan); + spin_unlock_irqrestore(&dspan->lock, flags); + + /* drop the reference taken during DAHDI_TRUNKDEV_OPEN */ + put_span(dspan); + + td->file = NULL; + file->private_data = NULL; + + return 0; +} + +static long dahdi_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long data) +{ + struct dahdi_trunkdev_create create; + struct dahdi_trunkdev_delete delete; + struct dahdi_trunkdev_open open; + char name[40]; + struct dahdi_trunkdev *td; + struct dahdi_span *span; + unsigned long flags; + int res; + + printk(KERN_DEBUG "%s(cmd=%u)\n", __func__, cmd); + + switch (cmd) { + case DAHDI_TRUNKDEV_CREATE: /* create an new trunkdev/span */ + printk(KERN_DEBUG "%s(cmd=DAHDI_TRUNKDEV_CREATE)\n", __func__); + if (copy_from_user(&create, (__user const void *) data, sizeof(create))) + return -EFAULT; + res = trunkdev_create(create.name); + if (res < 0) + return res; + create.spanno = res; + if (copy_to_user((__user void *) data, &create, sizeof(create))) { + trunkdev_free(td); + return -EFAULT; + } + /* increase module reference count to avoid module unload until all + * trunkdev have been deleted again */ + if (!try_module_get(THIS_MODULE)) { + trunkdev_free(td); + return -ENXIO; + } + return 0; + + case DAHDI_TRUNKDEV_DELETE: /* destroy an existing trunkdev/span */ + printk(KERN_DEBUG "%s(cmd=DAHDI_TRUNKDEV_DELETE)\n", __func__); + if (copy_from_user(&delete, (__user const void *) data, sizeof(delete))) + return -EFAULT; + snprintf(name, sizeof(name), TRUNKDEV_FMT, delete.name); + span = dahdi_span_find_by_name_and_get(name); + if (!span) + return -ENODEV; + if (span->ops != &trunkdev_span_ops) { + /* the span with this name is not a trunkdev span */ + put_span(span); + return -EINVAL; + } + td = container_of(span, struct dahdi_trunkdev, dahdi.span); + if (td->file) { + /* some other file already opened this span */ + put_span(span); + return -EBUSY; + } + /* FIXME: some kind of mutex required? */ + /* release the reference we obtained above before free'ing underlying memory */ + put_span(span); + trunkdev_free(td); + /* drop the reference we hold from TRUNKDEV_CREATE time */ + module_put(THIS_MODULE); + return 0; + + case DAHDI_TRUNKDEV_OPEN: /* open a trunkdev/span */ + printk(KERN_DEBUG "%s(cmd=DAHDI_TRUNKDEV_OPEN)\n", __func__); + if (unlikely(file->private_data)) + return -EBUSY; + if (copy_from_user(&open, (__user const void *) data, sizeof(open))) + return -EFAULT; + snprintf(name, sizeof(name), TRUNKDEV_FMT, open.name); + span = dahdi_span_find_by_name_and_get(name); + if (!span) + return -ENODEV; + if (span->ops != &trunkdev_span_ops) { + /* the span with this name is not a trunkdev span */ + put_span(span); + return -EINVAL; + } + td = container_of(span, struct dahdi_trunkdev, dahdi.span); + if (td->file) { + /* some other file already opened this span */ + put_span(span); + return -EBUSY; + } + /* FIXME: some kind of mutex required? */ + file->private_data = td; + td->file = file; + /* remove all alarms */ + spin_lock_irqsave(&span->lock, flags); + span->alarms &= ~(ALL_RY_ALARMS|DAHDI_ALARM_LOS); + dahdi_alarm_notify(span); + spin_unlock_irqrestore(&span->lock, flags); + + open.spanno = span->spanno; + if (copy_to_user((__user void *) data, &open, sizeof(open))) + return -EFAULT; + return 0; + default: + printk(KERN_ERR "%s(invalid cmd=0x%x)\n", __func__, cmd); + return -EINVAL; + } +} + +static ssize_t dahdi_trunkdev_read(struct file *file, char __user *usrbuf, + size_t count, loff_t *ppos) +{ + struct dahdi_trunkdev *td = file->private_data; + size_t copied = 0; + + if (unlikely(!td)) + return -ENODEV; + + if (unlikely(count < 1)) + return -EINVAL; + + if (unlikely(count % BYTES_PER_FRAME)) + return -EINVAL; + + while (copied < count) { + uint8_t frame[BYTES_PER_FRAME]; + int rc; + + rc = frame_fifo_out(&td->to_trunk, frame); + if (rc < 0) { + /* insufficient data available */ + if (file->f_flags & O_NONBLOCK) { + if (copied == 0) + return -EAGAIN; + else + return copied; + } + /* blocking wait for frames in FIFO or for device disappearing */ + rc = wait_event_interruptible(td->waitq, + (frame_fifo_frames(&td->to_trunk) || !file->private_data)); + if (rc) + return rc; + /* device has disappeared */ + if (!file->private_data) + return -ENODEV; + } + if (copy_to_user(usrbuf + copied, frame, sizeof(frame))) + return -EFAULT; + copied += sizeof(frame); + } + + return copied; +} + +static ssize_t dahdi_trunkdev_write(struct file *file, const char __user *usrbuf, size_t count, loff_t *ppos) +{ + struct dahdi_trunkdev *td = file->private_data; + size_t copied = 0; + + if (unlikely(!td)) + return -ENODEV; + + if (unlikely(count < 1)) + return -EINVAL; + + if (unlikely(count % BYTES_PER_FRAME)) + return -EINVAL; + + while (copied < count) { + uint8_t frame[BYTES_PER_FRAME]; + + if (copy_from_user(frame, usrbuf + copied, sizeof(frame))) + return -EFAULT; + + frame_fifo_in(&td->from_trunk, frame); + copied += sizeof(frame); + /* TODO: we could detect overflow and start blocking? */ + } + + return copied; +} + +static unsigned int dahdi_trunkdev_poll(struct file *file, struct poll_table_struct *wait_table) +{ + struct dahdi_trunkdev *td = file->private_data; + unsigned int ret = 0; + + if (unlikely(!td)) + return POLLERR | POLLHUP | POLLRDHUP | POLLNVAL | POLLPRI; + + poll_wait(file, &td->waitq, wait_table); + + if (frame_fifo_frames(&td->to_trunk)) + ret |= POLLIN | POLLRDNORM; + + /* we currently always allow write to the fifo, as we don't detect overflows yet */ + ret |= POLLOUT | POLLWRNORM; + + return ret; +} + +static const struct file_operations __dahdi_trunkdev_fops = { + .owner = THIS_MODULE, + .open = dahdi_trunkdev_open, + .release = dahdi_trunkdev_release, + .unlocked_ioctl = dahdi_unlocked_ioctl, + .read = dahdi_trunkdev_read, + .write = dahdi_trunkdev_write, + .poll = dahdi_trunkdev_poll, +}; + +static struct dahdi_chardev trunkdev_chardev = { + .name = "trunkdev", + .minor = DAHDI_TRUNKDEV, +}; + +static int __init dahdi_trunkdev_init(void) +{ + int res; + + if (dahdi_trunkdev_fops) { + printk(KERN_WARNING "dahdi_trunkdev_fops already set.\n"); + return -EBUSY; + } + + if ((res = dahdi_register_chardev(&trunkdev_chardev))) + return res; + + dahdi_trunkdev_fops = (struct file_operations *) &__dahdi_trunkdev_fops; + + printk(KERN_INFO "%s: Loaded.\n", THIS_MODULE->name); + return 0; +} + +static void __exit dahdi_trunkdev_cleanup(void) +{ + dahdi_unregister_chardev(&trunkdev_chardev); + dahdi_trunkdev_fops = NULL; + printk(KERN_INFO "%s: Unloaded.\n", THIS_MODULE->name); +} + +MODULE_DESCRIPTION("DAHDI virtual trunk device"); +MODULE_AUTHOR("Harald Welte <laforge(a)osmocom.org>"); +MODULE_LICENSE("GPL"); + +module_init(dahdi_trunkdev_init); +module_exit(dahdi_trunkdev_cleanup); diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 0df4f5e..0a25854 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1216,6 +1216,9 @@ void dahdi_free_device(struct dahdi_device *ddev); void dahdi_init_span(struct dahdi_span *span); +/*! Find a span by its name and get a reference */ +struct dahdi_span *dahdi_span_find_by_name_and_get(const char *name); + /*! Allocate / free memory for a transcoder */ struct dahdi_transcoder *dahdi_transcoder_alloc(int numchans); void dahdi_transcoder_free(struct dahdi_transcoder *ztc); @@ -1295,6 +1298,7 @@ } extern struct file_operations *dahdi_transcode_fops; +extern struct file_operations *dahdi_trunkdev_fops; int dahdi_get_auto_assign_spans(void); @@ -1592,6 +1596,7 @@ #define DAHDI_CTL 0 #define DAHDI_TRANSCODE 250 +#define DAHDI_TRUNKDEV 252 #define DAHDI_TIMER 253 #define DAHDI_CHANNEL 254 #define DAHDI_PSEUDO 255 diff --git a/include/dahdi/user.h b/include/dahdi/user.h index d69dc91..17e7a0e 100644 --- a/include/dahdi/user.h +++ b/include/dahdi/user.h @@ -1225,4 +1225,24 @@ *dst = '\0'; } +struct dahdi_trunkdev_create { + char name[40]; /* name of the to-be-created span */ + //int numchans; + int spanno; /* Span number (filled in by DAHDI) */ +}; +#define DAHDI_TRUNKDEV_CREATE _IOWR(DAHDI_CODE, 255, struct dahdi_trunkdev_create) + +struct dahdi_trunkdev_delete { + char name[40]; /* name of the to-be-opened span */ +}; +#define DAHDI_TRUNKDEV_DELETE _IOWR(DAHDI_CODE, 254, struct dahdi_trunkdev_delete) + +struct dahdi_trunkdev_open { + char name[40]; /* name of the to-be-opened span */ + int spanno; /* Span number (filled in by DAHDI) */ +}; +#define DAHDI_TRUNKDEV_OPEN _IOWR(DAHDI_CODE, 253, struct dahdi_trunkdev_open) + + + #endif /* _DAHDI_USER_H */ -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iffd9a1a09d835b29927acd374364cab56745fb74 Gerrit-Change-Number: 34010 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in dahdi-linux[master]: trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP

by laforge

Attention is currently required from: roox, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34012 ) Change subject: trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I12cf9647fb6def38865aaac8ad6bbb58ebf7b5fd Gerrit-Change-Number: 34012 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 09 Aug 2023 15:55:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[L] Change in dahdi-linux[master]: Introduce virtual DAHDI trunk device

by laforge

Attention is currently required from: roox, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34010 ) Change subject: Introduce virtual DAHDI trunk device ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iffd9a1a09d835b29927acd374364cab56745fb74 Gerrit-Change-Number: 34010 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 09 Aug 2023 15:55:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in libosmocore[master]: socket: Add osmo_sock_init flag to enable SCTP ASCONF features

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34113 ) Change subject: socket: Add osmo_sock_init flag to enable SCTP ASCONF features ...................................................................... Patch Set 2: Code-Review+1 (2 comments) File src/core/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/34113/comment/fcf5378b_cdba4b0b PS2, Line 709: skip skipping ? https://gerrit.osmocom.org/c/libosmocore/+/34113/comment/75a2a236_61b5f32e PS2, Line 724: LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_ASCONF_SUPPORTED), skip!\n"); skipping ? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iac07031927b66a9d32d2bb2faab817e4c922a359 Gerrit-Change-Number: 34113 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Aug 2023 15:53:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in libosmo-sccp[master]: asp: Monitor SCTP_PEER_ADDR_CHANGE events to re-apply configured Prim...

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34112 ) Change subject: asp: Monitor SCTP_PEER_ADDR_CHANGE events to re-apply configured Primary Address ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I2e54e6f9e424350474db6dec6ab604b33a03f88b Gerrit-Change-Number: 34112 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Aug 2023 15:51:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in libosmo-sccp[master]: ss7: Log addr and event state for SCTP_PEER_ADDR_CHANGE

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34088 ) Change subject: ss7: Log addr and event state for SCTP_PEER_ADDR_CHANGE ...................................................................... ss7: Log addr and event state for SCTP_PEER_ADDR_CHANGE Change-Id: I989f0180dab25cd6fb1a0c0a49c04a03be118ba3 --- M src/osmo_ss7.c 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index bc483a6..22139b9 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1729,6 +1729,17 @@ LOGPASP(asp, DLSS7, log_level, "%s SCTP_ASSOC_CHANGE: %s\n", pfx, osmo_sctp_assoc_chg_str(notif->sn_assoc_change.sac_state)); break; + case SCTP_PEER_ADDR_CHANGE: + { + char addr_str[INET6_ADDRSTRLEN + 10]; + struct sockaddr_storage sa = notif->sn_paddr_change.spc_aaddr; + osmo_sockaddr_to_str_buf(addr_str, sizeof(addr_str), (const struct osmo_sockaddr *)&sa); + LOGPASP(asp, DLSS7, log_level, "%s SCTP_PEER_ADDR_CHANGE: %s %s err=%s\n", + pfx, osmo_sctp_paddr_chg_str(notif->sn_paddr_change.spc_state), addr_str, + (notif->sn_paddr_change.spc_state == SCTP_ADDR_UNREACHABLE) ? + osmo_sctp_sn_error_str(notif->sn_paddr_change.spc_error) : "None"); + } + break; default: LOGPASP(asp, DLSS7, log_level, "%s %s\n", pfx, osmo_sctp_sn_type_str(notif->sn_header.sn_type)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I989f0180dab25cd6fb1a0c0a49c04a03be118ba3 Gerrit-Change-Number: 34088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in libosmo-sccp[master]: tests/vty: test multiple local/remote IP addresses

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34056 ) Change subject: tests/vty: test multiple local/remote IP addresses ...................................................................... tests/vty: test multiple local/remote IP addresses Change-Id: I9e8c6499b26edea271ee8d8c4ab86506e765e000 --- M tests/vty/ss7_asp_test.vty 1 file changed, 21 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index f7d92bd..3296c65 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -248,6 +248,13 @@ ASP Name AS Name State Type Role Remote IPaddr & Port SCTP Role ------------ ------------ ------------- ---- ---- ----------------------- --------- my-asp ? uninitialized m3ua sg 127.0.0.200:12345 server +ss7_asp_vty_test(config-cs7-asp)# remote-ip 127.0.0.201 +ss7_asp_vty_test(config-cs7-asp)# local-ip 127.0.0.101 +ss7_asp_vty_test(config-cs7-asp)# do show cs7 instance 0 asp + Current Primary Link +ASP Name AS Name State Type Role Remote IPaddr & Port SCTP Role +------------ ------------ ------------- ---- ---- ----------------------- --------- +my-asp ? uninitialized m3ua sg (127.0.0.200|127.0.0.201):12345 server ss7_asp_vty_test(config-cs7-asp)# exit ss7_asp_vty_test(config-cs7)# as my-ass m3ua @@ -311,14 +318,14 @@ Current Primary Link ASP Name AS Name State Type Role Remote IPaddr & Port SCTP Role ------------ ------------ ------------- ---- ---- ----------------------- --------- -my-asp my-ass ASP_DOWN m3ua sg 127.0.0.200:12345 server +my-asp my-ass ASP_DOWN m3ua sg (127.0.0.200|127.0.0.201):12345 server ss7_asp_vty_test(config-cs7-as)# exit ss7_asp_vty_test(config-cs7)# do show cs7 instance 0 asp Current Primary Link ASP Name AS Name State Type Role Remote IPaddr & Port SCTP Role ------------ ------------ ------------- ---- ---- ----------------------- --------- -my-asp my-ass ASP_DOWN m3ua sg 127.0.0.200:12345 server +my-asp my-ass ASP_DOWN m3ua sg (127.0.0.200|127.0.0.201):12345 server ss7_asp_vty_test(config-cs7)# exit @@ -327,7 +334,7 @@ Current Primary Link ASP Name AS Name State Type Role Remote IPaddr & Port SCTP Role ------------ ------------ ------------- ---- ---- ----------------------- --------- -my-asp my-ass ASP_DOWN m3ua sg 127.0.0.200:12345 server +my-asp my-ass ASP_DOWN m3ua sg (127.0.0.200|127.0.0.201):12345 server ss7_asp_vty_test(config)# do show cs7 instance 0 as all Routing Routing Key Cic Cic Traffic @@ -342,7 +349,9 @@ cs7 instance 0 asp my-asp 12345 54321 m3ua local-ip 127.0.0.100 + local-ip 127.0.0.101 remote-ip 127.0.0.200 + remote-ip 127.0.0.201 role sg sctp-role server as my-ass m3ua -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9e8c6499b26edea271ee8d8c4ab86506e765e000 Gerrit-Change-Number: 34056 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in libosmo-sccp[master]: ss7: Log addr and event state for SCTP_PEER_ADDR_CHANGE

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34088 ) Change subject: ss7: Log addr and event state for SCTP_PEER_ADDR_CHANGE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I989f0180dab25cd6fb1a0c0a49c04a03be118ba3 Gerrit-Change-Number: 34088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Aug 2023 15:51:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023