diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..3c5e434e54ce233e39299370789a3b9e1ef943c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +.built +.built_check +.configured_ +.dep_files +.git_update +.prepared_* +ipkg-* +*.o +tags +wifimngr +.configured_* +.pkgdir +*.html +*.gcda +*.gcov +*.gcno +*.log +*.so +*.xml +.DS_Store +include/version.h diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..85863ee330bd0a62c0c4aa181e9ae7d175fa5017 --- /dev/null +++ b/LICENSE @@ -0,0 +1,308 @@ + 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. + + qosmngr - QoS Manager + Copyright (C) 2020 iopsys Software Solutions AB + + 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. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..c342593d15016a20b25ad24717e588f9075628d5 --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +# Makefile for qosmngr + +subdirs ?= src + +.PHONY: all clean + +all clean: + @for i in $(subdirs) ; do [ -d $$i ] && $(MAKE) -C $$i $@; done diff --git a/README.md b/README.md index 553c1472c4b9790f89f0963c063375520fb582ae..c0f7e826514269e6a7c7b75294d006af176eca38 100644 --- a/README.md +++ b/README.md @@ -1 +1,32 @@ QoS Manager +==== + +This program implements methods provided by the `qos` object on U-Bus. This is done by calling `libqos` provided by `easy-soc-libs`. + +So far, the only method implemented is: +- `get_status : {"ifname":"String","qid":"Integer"}` + - `ifname`: interface name for which we want to get the QoS statistics + - `qid`: the TX queue ID for which we want to get the statistics. Optional argument: if not provided, the statistics of all queues for a given interface are returned. + + The response given by this method is a JSON-formatted dump as such: + ``` + { + "queues": [ + { + "qid": 1, + "iface": "eth1", + "tx_packets": 1146, + "tx_bytes": 447762, + "tx_dropped_packets": 0, + "tx_dropped_bytes": 0 + }, + ] + } + ``` + +TODO +=== + +- Reimplement the `reload` method provided by existing scripts +- Tests +- Integration in the OS build diff --git a/VERSION b/VERSION new file mode 100644 index 0000000000000000000000000000000000000000..c227083464fb9af8955c90d2924774ee50abb547 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/common.mk b/common.mk new file mode 100644 index 0000000000000000000000000000000000000000..b9134e7e5f5afa5ad54bc19e745d074082274e47 --- /dev/null +++ b/common.mk @@ -0,0 +1,6 @@ +PROJECT_TOPLEVEL := $(dir $(CURDIR)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) + +INCLUDE_DIR = $(PROJECT_TOPLEVEL)/include + + +CC=gcc # gcc || clang \ No newline at end of file diff --git a/include/qosmngr.h b/include/qosmngr.h new file mode 100644 index 0000000000000000000000000000000000000000..9fc116b58f4c253c00634c3690bcff9d7e365f50 --- /dev/null +++ b/include/qosmngr.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * qosmngr.h - definitions used in qosmngr + * + * Copyright (C) 2020 iopsys Software Solutions AB. All rights reserved. + * + * Author: Oskar Viljasaar <oskar.viljasaar@iopsys.eu> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * 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 St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#ifndef QOSMNGR_H +#define QOSMNGR_H + +/* Needed to get the IFNAMSIZ define */ +#include <net/if.h> + +#include <qos.h> + + +/* UCI definitions, used to parse the config files at their right location */ +#define UCI_CONFIG_QOS "qos" + +#define QOS_SECTION_NAME "queue" + +#define OPT_ENABLE "enable" +#define OPT_IFNAME "ifname" +#define OPT_PRECEDENCE "precedence" +#define OPT_SCHEDULING "scheduling" +#define OPT_RATE "rate" +#define OPT_BURST_SIZE "burst_size" +#define OPT_WEIGHT "weight" + +/* A QoS queue. */ +struct qos_queue { + char name[IFNAMSIZ]; + bool enable; + struct qos_queue_config config; +}; + +int qosmngr_publish_object(struct ubus_context *ctx); + +int qosmngr_get_status(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg); + +#endif /* QOSMNGR_H */ diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..c923b315fdafa5e7f27b6832e0e96a098fdd77a5 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,32 @@ +include ../common.mk + +PROG = $(PROJECT_TOPLEVEL)/qosmngr +OBJS = main.o qosmngr.o + +PROG_CFLAGS = $(CFLAGS) -I$(INCLUDE_DIR) -Wall -fstrict-aliasing +PROG_LDFLAGS = $(LDFLAGS) +PROG_LIBS = -luci -lubus -lubox -ljson-c -lblobmsg_json -lnl-genl-3 -lnl-3 -lgcov -leasy -lqos + +%.o: %.c + $(CC) $(PROG_CFLAGS) $(FPIC) -c -o $@ $< + +.PHONY: version + +all: version $(PROG) + +version: $(INCLUDE_DIR)/version.h + +$(INCLUDE_DIR)/version.h: $(PROJECT_TOPLEVEL)/VERSION + @(dirty=$(shell (git status --porcelain | grep -q .) && echo -dirty); \ + [ -f $(PROJECT_TOPLEVEL)/VERSION ] && basever=$(shell cat $(PROJECT_TOPLEVEL)/VERSION) || \ + basever=Unknown; \ + xver=$(shell date +'%y%V%u-%H%M'); \ + echo "const char *qosmngr_base_version = \"$$basever\";" > $@; \ + echo "const char *qosmngr_xtra_version = \"$$xver$$dirty\";" >> $@; \ + ) + +$(PROG): $(OBJS) + $(CC) $(PROG_LDFLAGS) -o $@ $^ $(PROG_LIBS) + +clean: + rm -f *.o libqosmngr.so $(PROG) $(INCLUDE_DIR)/version.h diff --git a/src/main.c b/src/main.c new file mode 100644 index 0000000000000000000000000000000000000000..8a2490ea01f30004d387078538d9a4eb9a035d5d --- /dev/null +++ b/src/main.c @@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * main.c - qosmngr's boilerplate and entry point + * + * Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved. + * + * Author: Oskar Viljasaar <oskar.viljasaar@iopsys.eu> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * 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 St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include <stdio.h> +#include <stdlib.h> + +#include <libubus.h> + +#include "qosmngr.h" +#include "version.h" + +const char *ubus_socket; + +struct ubus_context *ctx = NULL; + +/* install a signal handler */ +int set_sighandler(int sig, void (*handler)(int)) +{ + struct sigaction sa; + + memset(&sa, 0, sizeof(sa)); + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sa.sa_handler = handler; + if (sigaction(sig, &sa, NULL) < 0) { + fprintf(stderr, "Error sigaction %d\n", sig); + return -1; + } + + return 0; +} + +static int qosmngr_exit() +{ + ubus_free(ctx); + uloop_done(); + + exit(EXIT_SUCCESS); +} + +static void qosmngr_sighandler(int sig) +{ + switch (sig) { + case SIGTERM: + case SIGINT: + qosmngr_exit(); + break; + default: + break; + } +} + +void qosmngr_version() +{ + fprintf(stderr, "version : %s.%s\n", qosmngr_base_version, qosmngr_xtra_version); +} + +int main(int argc, char **argv) +{ + int ret; + int ch; + + while ((ch = getopt(argc, argv, "vs:e:")) != -1) { + switch (ch) { + case 'v': + qosmngr_version(); + exit(0); + case 's': + ubus_socket = optarg; + break; + default: + break; + } + } + + argc -= optind; + argv += optind; + + uloop_init(); + ctx = ubus_connect(ubus_socket); + if (!ctx) { + fprintf(stderr, "Failed to connect to ubus\n"); + return -1; + } + + ubus_add_uloop(ctx); + + ret = qosmngr_publish_object(ctx); + if (ret) + goto out; + + set_sighandler(SIGPIPE, SIG_DFL); + set_sighandler(SIGINT, qosmngr_sighandler); + set_sighandler(SIGTERM, qosmngr_sighandler); + + /* Main loop of qosmngr */ + uloop_run(); + + out: + ubus_free(ctx); + uloop_done(); + + return 0; +} diff --git a/src/qosmngr.c b/src/qosmngr.c new file mode 100644 index 0000000000000000000000000000000000000000..d66cffdd4b0d53690f26325ea96b3c732d58a26b --- /dev/null +++ b/src/qosmngr.c @@ -0,0 +1,163 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * qosmngr.c - main qosmngr's code + * + * Copyright (C) 2020 iopsys Software Solutions AB. All rights reserved. + * + * Author: Oskar Viljasaar <oskar.viljasaar@iopsys.eu> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * 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 St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include <libubus.h> +#include <uci.h> + +/* Needed to get the IFNAMSIZ define */ +#include <net/if.h> + +#include <qos.h> + +#include "qosmngr.h" + +/* Used as an internal value to query all the queues */ +#define QOS_QUEUE_ANY -1 + +enum { + QOS_POLICY_IFNAME, + QOS_POLICY_QID, + QOS_POLICY_MAX, + NUM_QOS_POLICY = QOS_POLICY_MAX, +}; + +static const struct blobmsg_policy get_status_policy[NUM_QOS_POLICY] = { + [QOS_POLICY_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING }, + [QOS_POLICY_QID] = { .name = "qid", .type = BLOBMSG_TYPE_INT32}, +}; + +static const struct ubus_method qos_methods[] = { + UBUS_METHOD("get_status", qosmngr_get_status, get_status_policy), +}; + +static struct ubus_object_type qos_object_type = + UBUS_OBJECT_TYPE("qos", qos_methods); + +static struct ubus_object test_object = { + .name = "qos", + .type = &qos_object_type, + .methods = qos_methods, + .n_methods = ARRAY_SIZE(qos_methods), +}; + +int qosmngr_get_status(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct blob_attr *tb[NUM_QOS_POLICY]; + struct blob_buf b = {0}; + struct qos_stats stats = {0}; + + char ifname[IFNAMSIZ] = {0}; + int queue_id = QOS_QUEUE_ANY; + + int i; + int ret; + + /* These are for the blobbuf array elements */ + void *d = NULL, *dd = NULL; + + blobmsg_parse(get_status_policy, QOS_POLICY_MAX, tb, blob_data(msg), + blob_len(msg)); + + + if (tb[QOS_POLICY_IFNAME]) { + strncpy(ifname, blobmsg_data(tb[QOS_POLICY_IFNAME]), sizeof(ifname)-1); + } + + /* Parse optional arguments */ + if (tb[QOS_POLICY_QID]) { + queue_id = blobmsg_get_u32(tb[QOS_POLICY_QID]); + } + + /* Can't have a queue id specified without an interface */ + if (tb[QOS_POLICY_QID] && !tb[QOS_POLICY_IFNAME]) { + return UBUS_STATUS_INVALID_ARGUMENT; + } + + blob_buf_init(&b, 0); + + d = blobmsg_open_array(&b, "queues"); + + if (queue_id == QOS_QUEUE_ANY) { + /* Should we replace this hardcoded limit of 'i' with something like + libqos_get_no_queues(const char *iface), and deal with the number of queues + internally library-side? */ + for (i=0; i<8; i++) { + + ret = qos_get_stats(ifname, i, &stats); + if (ret != 0) { + fprintf(stderr, "blob_get_status: ret %d\n", ret); + goto fail_get_status; + } + + dd = blobmsg_open_table(&b, ""); + + blobmsg_add_string(&b, "iface", ifname); + blobmsg_add_u32(&b, "qid", i); + blobmsg_add_u32(&b, "tx_packets", stats.tx_packets); + blobmsg_add_u32(&b, "tx_bytes", stats.tx_bytes); + blobmsg_add_u32(&b, "tx_dropped_packets", stats.tx_dropped_packets); + blobmsg_add_u32(&b, "tx_dropped_bytes", stats.tx_dropped_bytes); + + blobmsg_close_table(&b, dd); + } + } else { + ret = qos_get_stats(ifname, queue_id, &stats); + if (ret != 0) { + fprintf(stderr, "blob_get_status: ret %d\n", ret); + goto fail_get_status; + } + + dd = blobmsg_open_table(&b, ""); + + blobmsg_add_string(&b, "iface", ifname); + blobmsg_add_u32(&b, "qid", queue_id); + blobmsg_add_u32(&b, "tx_packets", stats.tx_packets); + blobmsg_add_u32(&b, "tx_bytes", stats.tx_bytes); + blobmsg_add_u32(&b, "tx_dropped_packets", stats.tx_dropped_packets); + blobmsg_add_u32(&b, "tx_dropped_bytes", stats.tx_dropped_bytes); + + blobmsg_close_table(&b, dd); + } + + blobmsg_close_array(&b, d); + + ubus_send_reply(ctx, req, b.head); + + fail_get_status: + blob_buf_free(&b); + return ret; +} + +int qosmngr_publish_object(struct ubus_context *ctx) +{ + int ret; + ret = ubus_add_object(ctx, &test_object); + if (ret) { + fprintf(stderr, "Failed to add 'qos' ubus object: %s\n", + ubus_strerror(ret)); + } + + return ret; +}