From d375bee1902047e5b34f37532a612a99634600ad Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 15 Apr 2022 18:18:33 +0200 Subject: [PATCH] introduce bchan handler infrastructure This should allow us to implement a variety of different bearer channel handlers. --- COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- bchan.c | 71 ++++++++++ bchan.h | 78 +++++++++++ capi.c | 66 +++++++++- capiconn.c | 15 +++ capiconn.h | 5 + hdlr_raw_loop.c | 40 ++++++ 8 files changed, 608 insertions(+), 8 deletions(-) create mode 100644 COPYING create mode 100644 bchan.c create mode 100644 bchan.h create mode 100644 hdlr_raw_loop.c diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/Makefile b/Makefile index 7456835..35f9f5e 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ clean: %.o: %.c $(CC) $(CFLAGS) -o $@ -c $^ -capi-test: capi.o capiconn.o +capi-test: capi.o capiconn.o bchan.o hdlr_raw_loop.o $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) diff --git a/bchan.c b/bchan.c new file mode 100644 index 0000000..783bfb9 --- /dev/null +++ b/bchan.c @@ -0,0 +1,71 @@ +/* B-channel handler management. Handles registration of and routing to + * various potentially registered B-channel handlers / routes + * + * (C) 2022 by Harald Welte + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include +#include + +#include "bchan.h" + +static LLIST_HEAD(g_handlers); +static LLIST_HEAD(g_routes); + +extern void *g_ctx; + +struct bchan_handler *bchan_handler_find(const char *name) +{ + struct bchan_handler *bch; + + llist_for_each_entry(bch, &g_handlers, list) { + if (!strcmp(bch->name, name)) + return bch; + } + return NULL; +} + +void bchan_handler_register(struct bchan_handler *hdlr) +{ + OSMO_ASSERT(!bchan_handler_find(hdlr->name)); + OSMO_ASSERT(hdlr->list.next == NULL); + + llist_add_tail(&hdlr->list, &g_handlers); +} + + +void bchan_route_add(int cip, const char *msn, const char *hdlr_name) +{ + struct bchan_handler *bch = bchan_handler_find(hdlr_name); + struct bchan_route *rt; + + OSMO_ASSERT(bch); + + rt = talloc_zero(g_ctx, struct bchan_route); + rt->cip = cip; + rt->msn = talloc_strdup(rt, msn); + rt->hdlr = bch; + + llist_add_tail(&rt->list, &g_routes); +} + + +/* find b-channel handler for given CIP + MSN */ +struct bchan_handler *bchan_handler_for_call(uint16_t cip, const char *msn) +{ + struct bchan_route *route; + + llist_for_each_entry(route, &g_routes, list) { + if (route->cip != -1 && route->cip != cip) + continue; + if (route->msn && strcmp(route->msn, msn)) + continue; + return route->hdlr; + } + + return NULL; +} diff --git a/bchan.h b/bchan.h new file mode 100644 index 0000000..046999b --- /dev/null +++ b/bchan.h @@ -0,0 +1,78 @@ +#pragma once + +/* B-channel handler management. Handles registration of and routing to + * various potentially registered B-channel handlers / routes + * + * (C) 2022 by Harald Welte + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include + +struct capi_connection; + +struct bchan_handler_cfg { + /* B1/B2/B3 protocol used in CAPI CONNECT_RESP */ + struct { + uint16_t b1; + uint16_t b2; + uint16_t b3; + } proto; + const uint8_t *ncpi; + uint32_t max_b_data_blocks; + uint32_t max_b_data_len; +}; + +struct call_state; + +/* call-back functions (operations) for a B-channel handler */ +struct bchan_handler_ops { + /* initialize whatever handler-private state (call setup) */ + int (*init)(struct call_state *cst); + /* receive data (ISDN -> handler) */ + void (*rx_data)(struct call_state *cst, const uint8_t *data, uint8_t len); + /* destroy whatever handler-private state (call teardown) */ + void (*fini)(struct call_state *cst); +}; + +/* The actual B-channel handler: list/name/config/ops */ +struct bchan_handler { + struct llist_head list; + /* name of this handler / application */ + const char *name; + /* CAPI related configuration */ + struct bchan_handler_cfg cfg; + struct bchan_handler_ops ops; + + /* handler private data */ + void *priv; +}; + +/* representation of one given call within a specific bchan-handler */ +struct call_state { + /* back-pointer to handler */ + struct bchan_handler *bch; + /* capiconn.h state */ + struct capi_connection *cc; + /* per-call private state (return value of bchan_handler.init) */ + void *priv; +}; + + +/* a route for routing incoming calls to a bchan-handler */ +struct bchan_route { + /* global list of bchan_routes */ + struct llist_head list; + int cip; /* -1: accept any CIP */ + const char *msn; /* NULL: accept any MSN / called number */ + struct bchan_handler *hdlr; /* handler for this CIP/MSN */ +}; + +struct bchan_handler *bchan_handler_find(const char *name); +void bchan_handler_register(struct bchan_handler *hdlr); +void bchan_route_add(int cip, const char *msn, const char *hdlr_name); +struct bchan_handler *bchan_handler_for_call(uint16_t cip, const char *msn); + +int bchan_call_tx(struct call_state *cst, const uint8_t *data, size_t len); diff --git a/capi.c b/capi.c index 6b38473..38ce5c1 100644 --- a/capi.c +++ b/capi.c @@ -1,3 +1,10 @@ +/* CAPI based ISDN testing utility. + * + * (C) 2022 by Harald Welte + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + #include #include @@ -11,20 +18,21 @@ #include #include "capiconn.h" +#include "bchan.h" #define CM(x) (1<<(x)) #define CIPMASK_ALL 0x1FFF03FF #define CIPMASK_VOICE (CM(1)|CM(4)|CM(5)|CM(16)|CM(26)) #define CIPMASK_DATA (CM(2)|CM(3)) +void *g_ctx; + enum log_subsys { DLCAPI20, DCAPI, }; -static void *tall_capi_ctx; - struct capi_inst { unsigned int applid; capiconn_context *cc_ctx; @@ -60,7 +68,7 @@ static const char *conninfo(capi_connection *p) static void *cb_malloc(size_t size) { - return talloc_size(tall_capi_ctx, size); + return talloc_size(g_ctx, size); } static void cb_free(void *buf) @@ -70,15 +78,49 @@ static void cb_free(void *buf) static void cb_disconnected(capi_connection *cp, int localdisconnect, unsigned reason, unsigned reason_b3) { + struct call_state *cst; LOGP(DCAPI, LOGL_DEBUG, "%s(local=%d, reason=0x%4x, reason_b3=0x%x)\n", __func__, localdisconnect, reason, reason_b3); + + cst = capiconn_getpriv(cp); + OSMO_ASSERT(cst); + if (cst->bch->ops.fini) + cst->bch->ops.fini(cst); + talloc_free(cst); } static void cb_incoming(capi_connection *cp, unsigned contr, unsigned cipvalue, char *called, char *calling) { + struct bchan_handler *bch; + int rc; + printf("incoming call: %s (0x%x) %s -> %s\n", conninfo(cp), cipvalue, calling, called); /* we should call capiconn_{accept,ignore,reject} */ - if (1) { - capiconn_accept(cp, 1, 1, 0, 0, 0, 0, 0); + + bch = bchan_handler_for_call(cipvalue, called); + if (bch) { + struct call_state *cst = talloc_zero(g_ctx, struct call_state); + if (!cst) { + capiconn_reject(cp); + return; + } + cst->bch = bch; + cst->cc = cp; + if (bch->ops.init) { + rc = bch->ops.init(cst); + if (rc < 0) { + talloc_free(cst); + capiconn_reject(cp); + } + } + rc = capiconn_accept(cp, bch->cfg.proto.b1, bch->cfg.proto.b2, bch->cfg.proto.b3, + 0, 0, 0, (uint8_t *)bch->cfg.ncpi); + if (rc != CAPICONN_OK) { + if (cst->bch->ops.fini) + cst->bch->ops.fini(cst); + talloc_free(cst); + capiconn_reject(cp); + } + capiconn_setpriv(cp, cst); } else capiconn_ignore(cp); } @@ -91,7 +133,9 @@ static void cb_connected(capi_connection *cp, _cstruct NCPI) /* user plane data received */ static void cb_datareceived(capi_connection *cp, unsigned char *data, unsigned int len) { + struct call_state *cst = capiconn_getpriv(cp); LOGP(DCAPI, LOGL_DEBUG, "%s(%p, %u)\n", __func__, data, len); + cst->bch->ops.rx_data(cst, data, len); } /* sent user plane data was confirmed */ @@ -105,7 +149,8 @@ static void cb_datasent(capi_connection *cp, unsigned char *data) static void cb_put_message(unsigned int appid, unsigned char *msg) { int rc; - //LOGP(DCAPI, LOGL_DEBUG, "%s(%u)\n", __func__, appid); + const char *str = capi20_cmd2str(CAPIMSG_COMMAND(msg), CAPIMSG_SUBCOMMAND(msg)); + LOGP(DCAPI, LOGL_DEBUG, "Tx to CAPI: %s\n", str); rc = capi20_put_message(appid, msg); if (rc) fprintf(stderr, "capi20_put_message: %s\n", capi_info2str(rc)); @@ -138,7 +183,7 @@ static void cb_errmsg(const char *fmt, ...) LOGPC(DCAPI, LOGL_ERROR, "\n"); } -capiconn_callbacks callbacks = { +static capiconn_callbacks callbacks = { .malloc = cb_malloc, .free = cb_free, @@ -160,6 +205,11 @@ capiconn_callbacks callbacks = { * initialization / integration ***********************************************************************/ +int bchan_call_tx(struct call_state *cst, const uint8_t *data, size_t len) +{ + return capiconn_send(cst->cc, (uint8_t *)data, len); +} + /* debug print callback for capi20 to log via libosmocore logging framework */ static int cb_capi_dprintf(const char *file, int line, const char *func, const char *fmt, va_list va) { @@ -255,6 +305,8 @@ int main(int argc, char **argv) osmo_init_logging2(ctx, &log_info); capi_init(ctx); + bchan_route_add(-1, NULL, "raw_loop"); + while (1) { osmo_select_main(0); } diff --git a/capiconn.c b/capiconn.c index f11a86c..bb4524b 100644 --- a/capiconn.c +++ b/capiconn.c @@ -118,6 +118,9 @@ struct capi_contr { } *ackqueue; int ackqueuelen; } *nccip; + + /* application private state */ + void *priv; } *connections; }; @@ -1789,3 +1792,15 @@ capiconn_listenstate(capiconn_context *ctx, unsigned contr) return CAPICONN_WRONG_STATE; return CAPICONN_OK; } + +void +capiconn_setpriv(capi_connection *cp, void *priv) +{ + cp->priv = priv; +} + +void * +capiconn_getpriv(capi_connection *cp) +{ + return cp->priv; +} diff --git a/capiconn.h b/capiconn.h index b257a83..4b0c846 100644 --- a/capiconn.h +++ b/capiconn.h @@ -432,4 +432,9 @@ int capiconn_listen(capiconn_context *ctx, */ int capiconn_listenstate(capiconn_context *ctx, unsigned contr); + +/* get/set private reference in connection */ +void capiconn_setpriv(capi_connection *cp, void *priv); +void *capiconn_getpriv(capi_connection *cp); + #endif /* __CAPICONN_H__ */ diff --git a/hdlr_raw_loop.c b/hdlr_raw_loop.c new file mode 100644 index 0000000..c8439fe --- /dev/null +++ b/hdlr_raw_loop.c @@ -0,0 +1,40 @@ + +#include "bchan.h" + +static int raw_loop_init(struct call_state *cst) +{ + /* no private data to allocate */ + return 0; +} + +static void raw_loop_rx(struct call_state *cst, const uint8_t *data, uint8_t len) +{ + /* echo whatever we received */ + bchan_call_tx(cst, data, len); +} + +static void raw_loop_fini(struct call_state *cst) +{ + /* no private data to free */ +} + + +static struct bchan_handler bch_raw_loop = { + .name = "raw_loop", + .cfg = { + .proto = { 1, 1, 0 }, + .ncpi = NULL, + .max_b_data_blocks = 10, + .max_b_data_len = 32, + }, + .ops = { + .init = raw_loop_init, + .rx_data = raw_loop_rx, + .fini = raw_loop_fini, + }, +}; + +static __attribute__((constructor)) void hldr_raw_init(void) +{ + bchan_handler_register(&bch_raw_loop); +}