Date: Thu, 9 Mar 2023 18:10:30 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: af0cc0b22362 - main - NgATM: Remove netgraph ATM support Message-ID: <202303091810.329IAUjr088440@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=af0cc0b22362153357d7b6783f64c4a11b1b03fe commit af0cc0b22362153357d7b6783f64c4a11b1b03fe Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2023-03-09 18:04:02 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2023-03-09 18:04:02 +0000 NgATM: Remove netgraph ATM support Most ATM support was removed prior to FreeBSD 12. The netgraph support was kept as it was less intrusive, but it is presumed to be unused. Reviewed by: manu Relnotes: yes Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D38879 --- ObsoleteFiles.inc | 43 + contrib/ngatm/FREEBSD-Xlist | 13 - contrib/ngatm/FREEBSD-upgrade | 13 - contrib/ngatm/libngatm/cccust.h | 49 - contrib/ngatm/libngatm/net_in.fig | 74 - contrib/ngatm/libngatm/net_out.fig | 76 - contrib/ngatm/libngatm/sscfucust.h | 108 - contrib/ngatm/libngatm/sscopcust.h | 255 - contrib/ngatm/libngatm/unicust.h | 123 - contrib/ngatm/libngatm/unimsg.c | 245 - contrib/ngatm/man/libngatm.3 | 75 - contrib/ngatm/man/uniaddr.3 | 129 - contrib/ngatm/man/unifunc.3 | 255 - contrib/ngatm/man/unimsg.3 | 249 - contrib/ngatm/man/unisap.3 | 265 - contrib/ngatm/man/unistruct.3 | 323 -- contrib/ngatm/snmp_atm/BEGEMOT-ATM.txt | 301 - contrib/ngatm/snmp_atm/atm.h | 96 - contrib/ngatm/snmp_atm/atm_tree.def | 75 - contrib/ngatm/snmp_atm/snmp_atm.3 | 218 - contrib/ngatm/snmp_atm/snmp_atm.c | 623 -- contrib/ngatm/snmp_atm/snmp_atm.h | 102 - contrib/ngatm/sscop/common.c | 456 -- contrib/ngatm/sscop/common.h | 82 - contrib/ngatm/sscop/sscop.1 | 169 - contrib/ngatm/sscop/sscop_main.c | 478 -- etc/mtree/BSD.include.dist | 10 - lib/Makefile | 1 - lib/libngatm/Makefile | 53 - lib/libngatm/Makefile.depend | 17 - share/man/man4/Makefile | 5 - share/man/man4/netgraph.4 | 3 - share/man/man4/ng_ccatm.4 | 328 -- share/man/man4/ng_sscfu.4 | 166 - share/man/man4/ng_sscop.4 | 408 -- share/man/man4/ng_uni.4 | 425 -- share/man/man4/ngatmbase.4 | 139 - sys/conf/NOTES | 7 - sys/conf/files | 54 - sys/conf/options | 7 - sys/contrib/ngatm/FREEBSD-Xlist | 15 - sys/contrib/ngatm/FREEBSD-upgrade | 26 - sys/contrib/ngatm/netnatm/addr.h | 42 - sys/contrib/ngatm/netnatm/api/atmapi.h | 291 - sys/contrib/ngatm/netnatm/api/cc_conn.c | 2096 ------- sys/contrib/ngatm/netnatm/api/cc_data.c | 226 - sys/contrib/ngatm/netnatm/api/cc_dump.c | 334 -- sys/contrib/ngatm/netnatm/api/cc_port.c | 923 --- sys/contrib/ngatm/netnatm/api/cc_sig.c | 350 -- sys/contrib/ngatm/netnatm/api/cc_user.c | 1922 ------- sys/contrib/ngatm/netnatm/api/ccatm.h | 154 - sys/contrib/ngatm/netnatm/api/ccpriv.h | 562 -- sys/contrib/ngatm/netnatm/api/unisap.c | 415 -- sys/contrib/ngatm/netnatm/api/unisap.h | 130 - sys/contrib/ngatm/netnatm/genfiles | 15 - sys/contrib/ngatm/netnatm/misc/straddr.c | 235 - sys/contrib/ngatm/netnatm/misc/unimsg_common.c | 54 - sys/contrib/ngatm/netnatm/msg/geniec.awk | 110 - sys/contrib/ngatm/netnatm/msg/genieh.awk | 61 - sys/contrib/ngatm/netnatm/msg/genmsgc.awk | 274 - sys/contrib/ngatm/netnatm/msg/genmsgh.awk | 80 - sys/contrib/ngatm/netnatm/msg/ie.def | 84 - sys/contrib/ngatm/netnatm/msg/msg.def | 582 -- sys/contrib/ngatm/netnatm/msg/parseie.awk | 150 - sys/contrib/ngatm/netnatm/msg/parsemsg.awk | 138 - sys/contrib/ngatm/netnatm/msg/priv.h | 119 - sys/contrib/ngatm/netnatm/msg/privmsg.c | 277 - sys/contrib/ngatm/netnatm/msg/traffic.c | 406 -- sys/contrib/ngatm/netnatm/msg/uni_config.h | 70 - sys/contrib/ngatm/netnatm/msg/uni_hdr.h | 220 - sys/contrib/ngatm/netnatm/msg/uni_ie.c | 7168 ------------------------ sys/contrib/ngatm/netnatm/msg/uni_ie.h | 57 - sys/contrib/ngatm/netnatm/msg/uni_ietab.h | 958 ---- sys/contrib/ngatm/netnatm/msg/uni_msg.c | 4901 ---------------- sys/contrib/ngatm/netnatm/msg/uni_msg.h | 342 -- sys/contrib/ngatm/netnatm/msg/unimsglib.h | 168 - sys/contrib/ngatm/netnatm/msg/uniprint.h | 72 - sys/contrib/ngatm/netnatm/msg/unistruct.h | 1371 ----- sys/contrib/ngatm/netnatm/saal/saal_sscfu.c | 577 -- sys/contrib/ngatm/netnatm/saal/saal_sscop.c | 4946 ---------------- sys/contrib/ngatm/netnatm/saal/sscfu.h | 103 - sys/contrib/ngatm/netnatm/saal/sscfudef.h | 73 - sys/contrib/ngatm/netnatm/saal/sscfupriv.h | 66 - sys/contrib/ngatm/netnatm/saal/sscop.h | 126 - sys/contrib/ngatm/netnatm/saal/sscopdef.h | 159 - sys/contrib/ngatm/netnatm/saal/sscoppriv.h | 318 -- sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk | 80 - sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk | 55 - sys/contrib/ngatm/netnatm/sig/sig_call.c | 4310 -------------- sys/contrib/ngatm/netnatm/sig/sig_coord.c | 1171 ---- sys/contrib/ngatm/netnatm/sig/sig_party.c | 1353 ----- sys/contrib/ngatm/netnatm/sig/sig_print.c | 622 -- sys/contrib/ngatm/netnatm/sig/sig_reset.c | 827 --- sys/contrib/ngatm/netnatm/sig/sig_uni.c | 749 --- sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c | 594 -- sys/contrib/ngatm/netnatm/sig/sig_verify.c | 442 -- sys/contrib/ngatm/netnatm/sig/uni.h | 106 - sys/contrib/ngatm/netnatm/sig/unidef.h | 480 -- sys/contrib/ngatm/netnatm/sig/unimkmsg.h | 159 - sys/contrib/ngatm/netnatm/sig/unimsgcpy.h | 113 - sys/contrib/ngatm/netnatm/sig/unipriv.h | 563 -- sys/contrib/ngatm/netnatm/sig/unisig.h | 49 - sys/contrib/ngatm/netnatm/unimsg.h | 92 - sys/modules/netgraph/Makefile | 1 - sys/modules/netgraph/atm/Makefile | 10 - sys/modules/netgraph/atm/Makefile.inc | 3 - sys/modules/netgraph/atm/atmbase/Makefile | 20 - sys/modules/netgraph/atm/ccatm/Makefile | 17 - sys/modules/netgraph/atm/sscfu/Makefile | 14 - sys/modules/netgraph/atm/sscop/Makefile | 13 - sys/modules/netgraph/atm/uni/Makefile | 17 - sys/netgraph/atm/ccatm/ng_ccatm.c | 1193 ---- sys/netgraph/atm/ccatm/ng_ccatm_cust.h | 56 - sys/netgraph/atm/ng_ccatm.h | 171 - sys/netgraph/atm/ng_sscfu.h | 70 - sys/netgraph/atm/ng_sscop.h | 111 - sys/netgraph/atm/ng_uni.h | 121 - sys/netgraph/atm/ngatmbase.c | 502 -- sys/netgraph/atm/ngatmbase.h | 64 - sys/netgraph/atm/sscfu/ng_sscfu.c | 604 -- sys/netgraph/atm/sscfu/ng_sscfu_cust.h | 131 - sys/netgraph/atm/sscop/ng_sscop.c | 874 --- sys/netgraph/atm/sscop/ng_sscop_cust.h | 344 -- sys/netgraph/atm/uni/ng_uni.c | 922 --- sys/netgraph/atm/uni/ng_uni_cust.h | 150 - tools/build/mk/OptionalObsoleteFiles.inc | 40 - tools/regression/atm/Funcs.sh | 53 - tools/regression/atm/README | 14 - tools/regression/atm/RunTest.sh | 45 - tools/regression/atm/proto_cc/RunTest.sh | 10 - tools/regression/atm/proto_sscfu/RunTest.sh | 11 - tools/regression/atm/proto_sscop/RunTest.sh | 10 - tools/regression/atm/proto_uni/RunTest.sh | 12 - usr.bin/Makefile | 1 - usr.bin/atm/Makefile | 5 - usr.bin/atm/Makefile.inc | 3 - usr.bin/atm/sscop/Makefile | 13 - usr.bin/atm/sscop/Makefile.depend | 19 - 138 files changed, 43 insertions(+), 55650 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 7bbd91525cd5..4da87568a0cc 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,49 @@ # xargs -n1 | sort | uniq -d; # done +# 20230309: remove remaining ATM support +OLD_FILES+=usr/bin/sscop +OLD_FILES+=usr/include/netnatm/addr.h +OLD_FILES+=usr/include/netnatm/api/atmapi.h +OLD_FILES+=usr/include/netnatm/api/ccatm.h +OLD_FILES+=usr/include/netnatm/api/unisap.h +OLD_DIRS+=usr/include/netnatm/api +OLD_FILES+=usr/include/netnatm/msg/uni_config.h +OLD_FILES+=usr/include/netnatm/msg/uni_hdr.h +OLD_FILES+=usr/include/netnatm/msg/uni_ie.h +OLD_FILES+=usr/include/netnatm/msg/uni_msg.h +OLD_FILES+=usr/include/netnatm/msg/unimsglib.h +OLD_FILES+=usr/include/netnatm/msg/uniprint.h +OLD_FILES+=usr/include/netnatm/msg/unistruct.h +OLD_DIRS+=usr/include/netnatm/msg +OLD_FILES+=usr/include/netnatm/saal/sscfu.h +OLD_FILES+=usr/include/netnatm/saal/sscfudef.h +OLD_FILES+=usr/include/netnatm/saal/sscop.h +OLD_FILES+=usr/include/netnatm/saal/sscopdef.h +OLD_DIRS+=usr/include/netnatm/saal +OLD_FILES+=usr/include/netnatm/sig/uni.h +OLD_FILES+=usr/include/netnatm/sig/unidef.h +OLD_FILES+=usr/include/netnatm/sig/unisig.h +OLD_DIRS+=usr/include/netnatm/sig +OLD_FILES+=usr/include/netnatm/unimsg.h +OLD_DIRS+=usr/include/netnatm +OLD_FILES+=usr/lib/libngatm.a +OLD_FILES+=usr/lib/libngatm.so +OLD_LIBS+=usr/lib/libngatm.so.4 +OLD_FILES+=usr/lib/libngatm_p.a +OLD_FILES+=usr/share/man/man1/sscop.1.gz +OLD_FILES+=usr/share/man/man3/libngatm.3.gz +OLD_FILES+=usr/share/man/man3/uniaddr.3.gz +OLD_FILES+=usr/share/man/man3/unifunc.3.gz +OLD_FILES+=usr/share/man/man3/unimsg.3.gz +OLD_FILES+=usr/share/man/man3/unisap.3.gz +OLD_FILES+=usr/share/man/man3/unistruct.3.gz +OLD_FILES+=usr/share/man/man4/ng_ccatm.4.gz +OLD_FILES+=usr/share/man/man4/ng_sscfu.4.gz +OLD_FILES+=usr/share/man/man4/ng_sscop.4.gz +OLD_FILES+=usr/share/man/man4/ng_uni.4.gz +OLD_FILES+=usr/share/man/man4/ngatmbase.4.gz + # 20230308: machine-id merged into hostid_save OLD_FILES+=etc/rc.d/machine-id diff --git a/contrib/ngatm/FREEBSD-Xlist b/contrib/ngatm/FREEBSD-Xlist deleted file mode 100644 index 32e28ddb55fb..000000000000 --- a/contrib/ngatm/FREEBSD-Xlist +++ /dev/null @@ -1,13 +0,0 @@ -#$FreeBSD$ -*/VERSION -*/README -*/Makefile.in -*/Makefile.pre -*/Makefile.post -*/aclocal.m4 -*/config -*/configure -*/configure.ac -*/netnatm -*/snmp_atm/atm_sys.c -*/snmp_ilmid diff --git a/contrib/ngatm/FREEBSD-upgrade b/contrib/ngatm/FREEBSD-upgrade deleted file mode 100644 index 4557bf72bad2..000000000000 --- a/contrib/ngatm/FREEBSD-upgrade +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - -This is the user part of the NgATM stuff. Be careful to feed changes -back to the maintainer <harti@freebsd.org>, because the code here is -actually shared with other environments besides FreeBSD. - -Import should be done by: - - cvs import \ - -m "Virgin import of NgATM user part X.Y" \ - src/contrib/ngatm BEGEMOT NGATM_X_Y - -harti diff --git a/contrib/ngatm/libngatm/cccust.h b/contrib/ngatm/libngatm/cccust.h deleted file mode 100644 index d67b12049cca..000000000000 --- a/contrib/ngatm/libngatm/cccust.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2004 - * Hartmut Brandt - * All rights reserved. - * - * Author: Hartmut Brandt <harti@freebsd.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $Begemot: libunimsg/libngatm/cccust.h,v 1.2 2004/07/16 18:48:24 brandt Exp $ - * - * Customisation of call control source to user space. - */ - -#include <sys/types.h> -#include <sys/queue.h> -#include <stdio.h> -#include <stdlib.h> -#include <stddef.h> -#include <string.h> -#include <assert.h> -#include <errno.h> - -#define CCASSERT(E, M) assert(E) - -#define CCMALLOC(S) (malloc((S))) -#define CCZALLOC(S) (calloc(1, (S))) -#define CCFREE(P) do { free(P); } while (0) - -#define CCGETERRNO() (errno) diff --git a/contrib/ngatm/libngatm/net_in.fig b/contrib/ngatm/libngatm/net_in.fig deleted file mode 100644 index 3914c1002dc9..000000000000 --- a/contrib/ngatm/libngatm/net_in.fig +++ /dev/null @@ -1,74 +0,0 @@ -#FIG 3.2 -Landscape -Center -Metric -Letter -100.00 -Single --2 -1200 2 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 675 225 225 5400 675 5400 900 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 1800 225 225 5400 1800 5400 2025 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 2925 225 225 5400 2925 5400 3150 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 4050 225 225 5400 4050 5400 4275 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5408 5169 225 225 5408 5169 5408 5394 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 4281 6292 225 225 4281 6292 4281 6517 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5408 7419 225 225 5408 7419 5408 7644 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 6525 6292 225 225 6525 6292 6525 6517 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 900 5400 1575 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 2025 5400 2700 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 3150 5400 3825 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 4275 5400 4950 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5 - 1 1 1.00 60.00 120.00 - 5625 2925 5850 2925 5850 4500 5625 4500 5400 4725 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5 - 1 1 1.00 60.00 120.00 - 5175 1800 4725 1800 4725 3375 5175 3375 5400 3600 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5 - 1 1 1.00 60.00 120.00 - 5175 1800 4275 1800 4275 4500 5175 4500 5400 4725 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 5400 5400 7200 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 60.00 120.00 - 5175 5175 4275 5175 4275 6075 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 60.00 120.00 - 5625 5175 6525 5175 6525 6075 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 60.00 120.00 - 4275 6525 4275 7425 5175 7425 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 60.00 120.00 - 6525 6525 6525 7425 5625 7425 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5 - 1 1 1.00 60.00 120.00 - 5625 1800 8100 1800 8100 7875 5400 7875 5400 7650 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 720 N0\001 -4 0 9 50 0 14 12 0.0000 4 135 1680 5445 1080 SETUP.indication\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 1845 N1\001 -4 0 20 50 0 14 12 0.0000 4 150 2520 5445 2205 PROCEEDING.request (opt)\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 2970 N3\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 4095 N4\001 -4 0 20 50 0 14 12 0.0000 4 135 1680 5760 1755 RELEASE.response\001 -4 0 20 50 0 14 12 0.0000 4 135 1470 5445 4860 SETUP.response\001 -4 0 20 50 0 14 12 0.0000 4 135 1680 5445 3690 ALERTING.request\001 -4 1 0 50 0 14 12 0.0000 4 120 315 5400 5220 N10\001 -4 1 0 50 0 14 12 0.0000 4 120 315 4275 6345 N11\001 -4 1 0 50 0 14 12 0.0000 4 120 315 6525 6345 N12\001 -4 2 9 50 0 14 12 0.0000 4 135 1890 5085 5130 RELEASE.indication\001 -4 0 20 50 0 14 12 0.0000 4 135 1575 5715 5130 RELEASE.request\001 -4 2 9 50 0 14 12 0.0000 4 135 1575 5355 5715 RELEASE.confirm\001 -4 0 9 50 0 14 12 0.0000 4 135 1575 5715 7605 RELEASE.confirm\001 -4 2 20 50 0 14 12 0.0000 4 135 1680 5085 7605 RELEASE.response\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 7470 N0\001 diff --git a/contrib/ngatm/libngatm/net_out.fig b/contrib/ngatm/libngatm/net_out.fig deleted file mode 100644 index c46356d0600f..000000000000 --- a/contrib/ngatm/libngatm/net_out.fig +++ /dev/null @@ -1,76 +0,0 @@ -#FIG 3.2 -Landscape -Center -Metric -Letter -100.00 -Single --2 -1200 2 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 675 225 225 5400 675 5400 900 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 1800 225 225 5400 1800 5400 2025 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 2925 225 225 5400 2925 5400 3150 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 4050 225 225 5400 4050 5400 4275 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5416 5181 225 225 5416 5181 5416 5406 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5408 6294 225 225 5408 6294 5408 6519 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 4281 7417 225 225 4281 7417 4281 7642 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5408 8544 225 225 5408 8544 5408 8769 -1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 6525 7417 225 225 6525 7417 6525 7642 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 900 5400 1575 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 2025 5400 2700 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 3150 5400 3825 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 4275 5400 4950 -2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 5400 5400 6075 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5 - 1 1 1.00 60.00 120.00 - 5175 1800 4950 1800 4950 3375 5175 3375 5400 3600 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5 - 1 1 1.00 60.00 120.00 - 5175 1800 4500 1800 4500 4500 5175 4500 5400 4725 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5 - 1 1 1.00 60.00 120.00 - 5625 2925 5850 2925 5850 4500 5625 4500 5400 4725 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 2 - 1 1 1.00 60.00 120.00 - 5400 6525 5400 8325 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 60.00 120.00 - 5175 6300 4275 6300 4275 7200 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 60.00 120.00 - 5625 6300 6525 6300 6525 7200 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 60.00 120.00 - 4275 7650 4275 8550 5175 8550 -2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3 - 1 1 1.00 60.00 120.00 - 6525 7650 6525 8550 5625 8550 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 720 N0\001 -4 0 20 50 0 14 12 0.0000 4 135 1365 5535 1125 SETUP.request\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 1845 N6\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 2970 N9\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 4095 N7\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 5220 N8\001 -4 1 0 50 0 14 12 0.0000 4 120 315 5400 6345 N10\001 -4 0 20 50 0 14 12 0.0000 4 135 2310 5535 5625 SETUP_COMPLETE.request\001 -4 0 9 50 0 14 12 0.0000 4 135 1995 5535 3735 ALERTING.indication\001 -4 0 9 50 0 14 12 0.0000 4 135 1365 5535 4860 SETUP.confirm\001 -4 0 9 50 0 14 12 0.0000 4 135 2205 5535 2610 PROCEEDING.indication\001 -4 1 0 50 0 14 12 0.0000 4 120 315 4275 7470 N11\001 -4 1 0 50 0 14 12 0.0000 4 120 315 6525 7470 N12\001 -4 2 9 50 0 14 12 0.0000 4 135 1890 5085 6255 RELEASE.indication\001 -4 0 20 50 0 14 12 0.0000 4 135 1575 5715 6255 RELEASE.request\001 -4 2 9 50 0 14 12 0.0000 4 135 1575 5355 6840 RELEASE.confirm\001 -4 0 9 50 0 14 12 0.0000 4 135 1575 5715 8730 RELEASE.confirm\001 -4 2 20 50 0 14 12 0.0000 4 135 1680 5085 8730 RELEASE.response\001 -4 1 0 50 0 14 12 0.0000 4 120 210 5400 8595 N0\001 diff --git a/contrib/ngatm/libngatm/sscfucust.h b/contrib/ngatm/libngatm/sscfucust.h deleted file mode 100644 index 760fd71660f9..000000000000 --- a/contrib/ngatm/libngatm/sscfucust.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2001-2003 - * Fraunhofer Institute for Open Communication Systems (FhG Fokus). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * Author: Hartmut Brandt <harti@freebsd.org> - * - * $Begemot: libunimsg/libngatm/sscfucust.h,v 1.4 2004/07/08 08:21:40 brandt Exp $ - * - * Customisation of the SSCFU code for the user space library. - */ -#include <sys/types.h> -#include <sys/queue.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#ifdef SSCFU_DEBUG -#include <assert.h> -#endif -#include <netnatm/unimsg.h> - -/* - * Allocate zeroed or non-zeroed memory of some size and cast it. - * Return NULL on failure. - */ -#define MEMINIT() - -#define MEMZALLOC(PTR,CAST,SIZE) do { \ - void *_m = malloc(SIZE); \ - if (_m != NULL) \ - bzero(_m, SIZE); \ - (PTR) = (CAST)_m; \ -} while(0) - -#define MEMFREE(PTR) \ - free(PTR) - -#define SIG_ALLOC(PTR) \ - MEMZALLOC(PTR, struct sscfu_sig *, sizeof(struct sscfu_sig)) -#define SIG_FREE(PTR) \ - MEMFREE(PTR) - -/* - * Signal queues - */ -typedef TAILQ_ENTRY(sscfu_sig) sscfu_sigq_link_t; -typedef TAILQ_HEAD(sscfu_sigq, sscfu_sig) sscfu_sigq_head_t; -#define SIGQ_INIT(Q) TAILQ_INIT(Q) -#define SIGQ_APPEND(Q,S) TAILQ_INSERT_TAIL(Q, S, link) -#define SIGQ_GET(Q) \ - ({ \ - struct sscfu_sig *_s = NULL; \ - \ - if(!TAILQ_EMPTY(Q)) { \ - _s = TAILQ_FIRST(Q); \ - TAILQ_REMOVE(Q, _s, link); \ - } \ - _s; \ - }) - -#define SIGQ_CLEAR(Q) \ - do { \ - struct sscfu_sig *_s1, *_s2; \ - \ - _s1 = TAILQ_FIRST(Q); \ - while(_s1 != NULL) { \ - _s2 = TAILQ_NEXT(_s1, link); \ - if(_s1->m) \ - MBUF_FREE(_s1->m); \ - SIG_FREE(_s1); \ - _s1 = _s2; \ - } \ - TAILQ_INIT(Q); \ - } while(0) - - -/* - * Message buffers - */ -#define MBUF_FREE(M) uni_msg_destroy(M) - -#ifdef SSCFU_DEBUG -#define ASSERT(S) assert(S) -#else -#define ASSERT(S) -#endif diff --git a/contrib/ngatm/libngatm/sscopcust.h b/contrib/ngatm/libngatm/sscopcust.h deleted file mode 100644 index 12736c26c030..000000000000 --- a/contrib/ngatm/libngatm/sscopcust.h +++ /dev/null @@ -1,255 +0,0 @@ -/* - * Copyright (c) 2001-2003 - * Fraunhofer Institute for Open Communication Systems (FhG Fokus). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * Author: Hartmut Brandt <harti@freebsd.org> - * - * $Begemot: libunimsg/libngatm/sscopcust.h,v 1.4 2004/07/08 08:21:40 brandt Exp $ - * - * Customisation of the SSCOP code for the user space library. - */ -#include <sys/types.h> -#include <sys/queue.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <stdarg.h> -#include <errno.h> -#ifdef SSCOP_DEBUG -#include <assert.h> -#endif -#include <netinet/in.h> -#include <arpa/inet.h> -#include <netnatm/unimsg.h> - -/* - * Allocate zeroed or non-zeroed memory of some size and cast it. - * Return NULL on failure. - */ -#define MEMINIT() - -#define MEMZALLOC(PTR,CAST,SIZE) do { \ - void *_m = malloc(SIZE); \ - if (_m != NULL) \ - bzero(_m, SIZE); \ - (PTR) = (CAST)_m; \ -} while(0) - -#define MEMFREE(PTR) free(PTR); - -#define MSG_ALLOC(PTR) \ - MEMZALLOC(PTR, struct sscop_msg *, sizeof(struct sscop_msg)) -#define MSG_FREE(PTR) \ - MEMFREE(PTR) - -#define SIG_ALLOC(PTR) \ - MEMZALLOC(PTR, struct sscop_sig *, sizeof(struct sscop_sig)) -#define SIG_FREE(PTR) \ - MEMFREE(PTR) - -/* - * Timer support. - */ -typedef void *sscop_timer_t; -#define TIMER_INIT(S,T) (S)->t_##T = NULL -#define TIMER_STOP(S,T) do { \ - if ((S)->t_##T != NULL) { \ - (S)->funcs->stop_timer((S), (S)->aarg, (S)->t_##T); \ - (S)->t_##T = NULL; \ - } \ - } while(0) -#define TIMER_RESTART(S,T) do { \ - if ((S)->t_##T != NULL) \ - (S)->funcs->stop_timer((S), (S)->aarg, (S)->t_##T); \ - (S)->t_##T = (S)->funcs->start_timer((S), (S)->aarg, \ - (S)->timer##T, T##_func); \ - } while(0) -#define TIMER_ISACT(S,T) ((S)->t_##T != NULL) - -#define TIMER_FUNC(T,N) \ -static void \ -T##_func(void *varg) \ -{ \ - struct sscop *sscop = varg; \ - VERBOSE(sscop, SSCOP_DBG_TIMER, (sscop, sscop->aarg, \ - "timer_" #T " expired")); \ - sscop->t_##T = NULL; \ - sscop_signal(sscop, SIG_T_##N, NULL); \ -} - - -/* - * Message queues - */ -typedef TAILQ_ENTRY(sscop_msg) sscop_msgq_link_t; -typedef TAILQ_HEAD(sscop_msgq, sscop_msg) sscop_msgq_head_t; -#define MSGQ_EMPTY(Q) TAILQ_EMPTY(Q) -#define MSGQ_INIT(Q) TAILQ_INIT(Q) -#define MSGQ_FOREACH(P,Q) TAILQ_FOREACH(P,Q,link) -#define MSGQ_REMOVE(Q,M) TAILQ_REMOVE(Q,M,link) -#define MSGQ_INSERT_BEFORE(B,M) TAILQ_INSERT_BEFORE(B,M,link) -#define MSGQ_APPEND(Q,M) TAILQ_INSERT_TAIL(Q,M,link) -#define MSGQ_PEEK(Q) (TAILQ_EMPTY((Q)) ? NULL : TAILQ_FIRST((Q))) -#define MSGQ_GET(Q) \ - ({ \ - struct sscop_msg *_m = NULL; \ - \ - if(!TAILQ_EMPTY(Q)) { \ - _m = TAILQ_FIRST(Q); \ - TAILQ_REMOVE(Q, _m, link); \ - } \ - _m; \ - }) - -#define MSGQ_CLEAR(Q) \ - do { \ - struct sscop_msg *_m1, *_m2; \ - \ - _m1 = TAILQ_FIRST(Q); \ - while(_m1 != NULL) { \ - _m2 = TAILQ_NEXT(_m1, link); \ - SSCOP_MSG_FREE(_m1); \ - _m1 = _m2; \ - } \ - TAILQ_INIT((Q)); \ - } while(0) - -/* - * Signal queues - */ -typedef TAILQ_ENTRY(sscop_sig) sscop_sigq_link_t; -typedef TAILQ_HEAD(sscop_sigq, sscop_sig) sscop_sigq_head_t; -#define SIGQ_INIT(Q) TAILQ_INIT(Q) -#define SIGQ_APPEND(Q,S) TAILQ_INSERT_TAIL(Q, S, link) -#define SIGQ_EMPTY(Q) TAILQ_EMPTY(Q) -#define SIGQ_GET(Q) \ - ({ \ - struct sscop_sig *_s = NULL; \ - \ - if(!TAILQ_EMPTY(Q)) { \ - _s = TAILQ_FIRST(Q); \ - TAILQ_REMOVE(Q, _s, link); \ - } \ - _s; \ - }) - -#define SIGQ_MOVE(F,T) \ - do { \ - struct sscop_sig *_s; \ - \ - while(!TAILQ_EMPTY(F)) { \ - _s = TAILQ_FIRST(F); \ - TAILQ_REMOVE(F, _s, link); \ - TAILQ_INSERT_TAIL(T, _s, link); \ - } \ - } while(0) - -#define SIGQ_PREPEND(F,T) \ - do { \ - struct sscop_sig *_s; \ - \ - while(!TAILQ_EMPTY(F)) { \ - _s = TAILQ_LAST(F, sscop_sigq); \ - TAILQ_REMOVE(F, _s, link); \ - TAILQ_INSERT_HEAD(T, _s, link); \ - } \ - } while(0) - -#define SIGQ_CLEAR(Q) \ - do { \ - struct sscop_sig *_s1, *_s2; \ - \ - _s1 = TAILQ_FIRST(Q); \ - while(_s1 != NULL) { \ - _s2 = TAILQ_NEXT(_s1, link); \ - SSCOP_MSG_FREE(_s1->msg); \ - SIG_FREE(_s1); \ - _s1 = _s2; \ - } \ - TAILQ_INIT(Q); \ - } while(0) - - - -/* - * Message buffers - */ -/* Free a buffer (if there is one) */ -#define MBUF_FREE(M) do { if(M) uni_msg_destroy(M); } while(0) - -/* duplicate a buffer */ -#define MBUF_DUP(M) uni_msg_dup(M) - -/* compute current length */ -#define MBUF_LEN(M) uni_msg_len((M)) - -/* - * Return the i-th word counted from the end of the buffer. - * i=-1 will return the last 32bit word, i=-2 the 2nd last. - * Assumes that there is enough space. - */ -#define MBUF_TRAIL32(M,I) uni_msg_trail32((M), (I)) - -/* - * Strip 32bit value from the end - */ -#define MBUF_STRIP32(M) uni_msg_strip32((M)) - -/* - * Strip 32bit value from head - */ -#define MBUF_GET32(M) uni_msg_get32((M)) - -/* - * Append a 32bit value to an mbuf. Failures are ignored. - */ -#define MBUF_APPEND32(M,W) uni_msg_append32((M), (W)) - -/* - * Pad a message to a multiple of four byte and return the amount of padding - * Failures are ignored. - */ -#define MBUF_PAD4(M) \ - ({ \ - int _npad = 0; \ - while (uni_msg_len(M) % 4 != 0) { \ - uni_msg_append8((M), 0); \ - _npad++; \ - } \ - _npad; \ - }) - -#define MBUF_UNPAD(M,P) do { (M)->b_wptr -= (P); } while(0) - -/* - * Allocate a message that will probably hold N bytes. - */ -#define MBUF_ALLOC(N) uni_msg_alloc(N) - -#ifdef SSCOP_DEBUG -#define ASSERT(X) assert(X) -#else -#define ASSERT(X) -#endif diff --git a/contrib/ngatm/libngatm/unicust.h b/contrib/ngatm/libngatm/unicust.h deleted file mode 100644 index ff028a65a8e6..000000000000 --- a/contrib/ngatm/libngatm/unicust.h +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2001-2003 - * Fraunhofer Institute for Open Communication Systems (FhG Fokus). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * Author: Hartmut Brandt <harti@freebsd.org> - * - * $Begemot: libunimsg/libngatm/unicust.h,v 1.4 2003/09/19 13:10:35 hbb Exp $ - * - * Customisation of signalling source to user space. - */ -#include <sys/types.h> -#include <sys/queue.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <assert.h> - -#define ASSERT(E, M) assert(E) - -static __inline__ void * -mzalloc(size_t s) -{ - void *ptr = malloc(s); - - if (ptr) - bzero(ptr, s); - return (ptr); -} - -#define INS_ALLOC() mzalloc(sizeof(struct uni)) -#define INS_FREE(P) free(P) - -#define UNI_ALLOC() mzalloc(sizeof(struct uni_all)) -#define UNI_FREE(P) free(P) - -#define SIG_ALLOC() mzalloc(sizeof(struct sig)) -#define SIG_FREE(P) free(P) - -#define CALL_ALLOC() mzalloc(sizeof(struct call)) -#define CALL_FREE(P) free(P) - -#define PARTY_ALLOC() mzalloc(sizeof(struct party)) -#define PARTY_FREE(P) free(P) - -/* - * Timers - */ -struct uni_timer { - void *c; -}; - -#define _TIMER_INIT(X,T) (X)->T.c = NULL -#define _TIMER_DESTROY(U,F) _TIMER_STOP(U,F) -#define _TIMER_STOP(U,F) \ - do { \ - if (F.c != NULL) { \ - (U)->funcs->stop_timer(U, U->arg, F.c); \ - F.c = NULL; \ - } \ - } while(0) -#define _TIMER_START(UNI,ARG,FIELD,DUE,FUNC) \ - (void)(FIELD.c = (UNI)->funcs->start_timer(UNI, \ - UNI->arg, DUE, FUNC, ARG)) - -#define TIMER_ISACT(X,T) (X->T.c != NULL) - -#define TIMER_FUNC_UNI(T,F) \ -static void F(struct uni *); \ -static void \ -_##T##_func(void *varg) \ -{ \ - struct uni *uni = (struct uni *)varg; \ - uni->T.c = NULL; \ - (F)(uni); \ -} - -/* - * Be careful: call may be invalid after the call to F - */ -#define TIMER_FUNC_CALL(T,F) \ -static void F(struct call *); \ -static void \ -_##T##_func(void *varg) \ -{ \ - struct call *call = (struct call *)varg; \ - call->T.c = NULL; \ - (F)(call); \ -} - -/* - * Be careful: call/party may be invalid after the call to F - */ -#define TIMER_FUNC_PARTY(T,F) \ -static void F(struct party *); \ -static void \ -_##T##_func(void *varg) \ -{ \ - struct party *party = (struct party *)varg; \ - party->T.c = NULL; \ - (F)(party); \ -} diff --git a/contrib/ngatm/libngatm/unimsg.c b/contrib/ngatm/libngatm/unimsg.c deleted file mode 100644 index 9df02a10598c..000000000000 --- a/contrib/ngatm/libngatm/unimsg.c +++ /dev/null @@ -1,245 +0,0 @@ -/* - * Copyright (c) 1996-2003 - * Fraunhofer Institute for Open Communication Systems (FhG Fokus). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: *** 55785 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303091810.329IAUjr088440>