From b73308f184f0a3fa06908e79e728ec7dfa1d5e51 Mon Sep 17 00:00:00 2001 From: Pieter Robyns Date: Sat, 24 Mar 2018 13:35:13 +0000 Subject: [PATCH] Small corrections --- grc/lora_message_socket_source.xml | 56 +++--- include/lora/message_socket_source.h | 255 +++++++++++++-------------- lib/message_socket_source_impl.cc | 140 ++++++--------- lib/message_socket_source_impl.h | 22 +-- 4 files changed, 210 insertions(+), 263 deletions(-) diff --git a/grc/lora_message_socket_source.xml b/grc/lora_message_socket_source.xml index cdc6554..c35732f 100644 --- a/grc/lora_message_socket_source.xml +++ b/grc/lora_message_socket_source.xml @@ -1,42 +1,28 @@ - Message Socket Source - lora_message_socket_source - [LoRa] - import lora - lora.message_socket_source($addr, $port, $mtu, $payload_len) + Message Socket Source + lora_message_socket_source + [LoRa] + import lora + lora.message_socket_source($addr, $port) - - UDP IP Address - addr - "127.0.0.1" - string - + + UDP IP Address + addr + "127.0.0.1" + string + - - UDP port - port - 40868 - int - + + UDP Port + port + 40868 + int + - - MTU - mtu - 1500 - int - - - - Payload length - payload_len - 100 - int - - - - out - message - + + out + message + diff --git a/include/lora/message_socket_source.h b/include/lora/message_socket_source.h index d273b3e..38b2b23 100644 --- a/include/lora/message_socket_source.h +++ b/include/lora/message_socket_source.h @@ -1,16 +1,16 @@ /* -*- c++ -*- */ /* GNU GENERAL PUBLIC LICENSE * Version 3, 29 June 2007 - * + * * Copyright (C) 2007 Free Software Foundation, Inc. * Everyone is permitted to copy and distribute verbatim copies * of this license document, but changing it is not allowed. - * + * * Preamble - * + * * The GNU General Public License is a free, copyleft license for * software and other kinds of works. - * + * * The licenses for most software and other practical works are designed * to take away your freedom to share and change the works. By contrast, * the GNU General Public License is intended to guarantee your freedom to @@ -19,35 +19,35 @@ * GNU General Public License for most of our software; it applies also to * any other work released this way by its authors. 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 * them 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 prevent others from denying you * these rights or asking you to surrender the rights. Therefore, you have * certain responsibilities if you distribute copies of the software, or if * you modify it: responsibilities to respect the freedom of others. - * + * * For example, if you distribute copies of such a program, whether * gratis or for a fee, you must pass on to the recipients the same * freedoms that you received. 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. - * + * * Developers that use the GNU GPL protect your rights with two steps: * (1) assert copyright on the software, and (2) offer you this License * giving you legal permission to copy, distribute and/or modify it. - * + * * For the developers' and authors' protection, the GPL clearly explains * that there is no warranty for this free software. For both users' and * authors' sake, the GPL requires that modified versions be marked as * changed, so that their problems will not be attributed erroneously to * authors of previous versions. - * + * * Some devices are designed to deny users access to install or run * modified versions of the software inside them, although the manufacturer * can do so. This is fundamentally incompatible with the aim of @@ -58,49 +58,49 @@ * products. If such problems arise substantially in other domains, we * stand ready to extend this provision to those domains in future versions * of the GPL, as needed to protect the freedom of users. - * + * * Finally, every program is threatened constantly by software patents. * States should not allow patents to restrict development and use of * software on general-purpose computers, but in those that do, we wish to * avoid the special danger that patents applied to a free program could * make it effectively proprietary. To prevent this, the GPL assures that * patents cannot be used to render the program non-free. - * + * * The precise terms and conditions for copying, distribution and * modification follow. - * + * * TERMS AND CONDITIONS - * + * * 0. Definitions. - * + * * "This License" refers to version 3 of the GNU General Public License. - * + * * "Copyright" also means copyright-like laws that apply to other kinds of * works, such as semiconductor masks. - * + * * "The Program" refers to any copyrightable work licensed under this * License. Each licensee is addressed as "you". "Licensees" and * "recipients" may be individuals or organizations. - * + * * To "modify" a work means to copy from or adapt all or part of the work * in a fashion requiring copyright permission, other than the making of an * exact copy. The resulting work is called a "modified version" of the * earlier work or a work "based on" the earlier work. - * + * * A "covered work" means either the unmodified Program or a work based * on the Program. - * + * * To "propagate" a work means to do anything with it that, without * permission, would make you directly or secondarily liable for * infringement under applicable copyright law, except executing it on a * computer or modifying a private copy. Propagation includes copying, * distribution (with or without modification), making available to the * public, and in some countries other activities as well. - * + * * To "convey" a work means any kind of propagation that enables other * parties to make or receive copies. Mere interaction with a user through * a computer network, with no transfer of a copy, is not conveying. - * + * * An interactive user interface displays "Appropriate Legal Notices" * to the extent that it includes a convenient and prominently visible * feature that (1) displays an appropriate copyright notice, and (2) @@ -109,18 +109,18 @@ * work under this License, and how to view a copy of this License. If * the interface presents a list of user commands or options, such as a * menu, a prominent item in the list meets this criterion. - * + * * 1. Source Code. - * + * * The "source code" for a work means the preferred form of the work * for making modifications to it. "Object code" means any non-source * form of a work. - * + * * A "Standard Interface" means an interface that either is an official * standard defined by a recognized standards body, or, in the case of * interfaces specified for a particular programming language, one that * is widely used among developers working in that language. - * + * * The "System Libraries" of an executable work include anything, other * than the work as a whole, that (a) is included in the normal form of * packaging a Major Component, but which is not part of that Major @@ -131,7 +131,7 @@ * (kernel, window system, and so on) of the specific operating system * (if any) on which the executable work runs, or a compiler used to * produce the work, or an object code interpreter used to run it. - * + * * The "Corresponding Source" for a work in object code form means all * the source code needed to generate, install, and (for an executable * work) run the object code and to modify the work, including scripts to @@ -144,16 +144,16 @@ * linked subprograms that the work is specifically designed to require, * such as by intimate data communication or control flow between those * subprograms and other parts of the work. - * + * * The Corresponding Source need not include anything that users * can regenerate automatically from other parts of the Corresponding * Source. - * + * * The Corresponding Source for a work in source code form is that * same work. - * + * * 2. Basic Permissions. - * + * * All rights granted under this License are granted for the term of * copyright on the Program, and are irrevocable provided the stated * conditions are met. This License explicitly affirms your unlimited @@ -161,7 +161,7 @@ * covered work is covered by this License only if the output, given its * content, constitutes a covered work. This License acknowledges your * rights of fair use or other equivalent, as provided by copyright law. - * + * * You may make, run and propagate covered works that you do not * convey, without conditions so long as your license otherwise remains * in force. You may convey covered works to others for the sole purpose @@ -172,19 +172,19 @@ * for you must do so exclusively on your behalf, under your direction * and control, on terms that prohibit them from making any copies of * your copyrighted material outside their relationship with you. - * + * * Conveying under any other circumstances is permitted solely under * the conditions stated below. Sublicensing is not allowed; section 10 * makes it unnecessary. - * + * * 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - * + * * No covered work shall be deemed part of an effective technological * measure under any applicable law fulfilling obligations under article * 11 of the WIPO copyright treaty adopted on 20 December 1996, or * similar laws prohibiting or restricting circumvention of such * measures. - * + * * When you convey a covered work, you waive any legal power to forbid * circumvention of technological measures to the extent such circumvention * is effected by exercising rights under this License with respect to @@ -192,9 +192,9 @@ * modification of the work as a means of enforcing, against the work's * users, your or third parties' legal rights to forbid circumvention of * technological measures. - * + * * 4. Conveying Verbatim Copies. - * + * * You may convey 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; @@ -202,24 +202,24 @@ * non-permissive terms added in accord with section 7 apply to the code; * keep intact all notices of the absence of any warranty; and give all * recipients a copy of this License along with the Program. - * + * * You may charge any price or no price for each copy that you convey, * and you may offer support or warranty protection for a fee. - * + * * 5. Conveying Modified Source Versions. - * + * * You may convey a work based on the Program, or the modifications to * produce it from the Program, in the form of source code under the * terms of section 4, provided that you also meet all of these conditions: - * + * * a) The work must carry prominent notices stating that you modified * it, and giving a relevant date. - * + * * b) The work must carry prominent notices stating that it is * released under this License and any conditions added under section * 7. This requirement modifies the requirement in section 4 to * "keep intact all notices". - * + * * c) You must license the entire work, as a whole, under this * License to anyone who comes into possession of a copy. This * License will therefore apply, along with any applicable section 7 @@ -227,12 +227,12 @@ * regardless of how they are packaged. This License gives no * permission to license the work in any other way, but it does not * invalidate such permission if you have separately received it. - * + * * d) If the work has interactive user interfaces, each must display * Appropriate Legal Notices; however, if the Program has interactive * interfaces that do not display Appropriate Legal Notices, your * work need not make them do so. - * + * * A compilation of a covered work with other separate and independent * works, which are not by their nature extensions of the covered work, * and which are not combined with it such as to form a larger program, @@ -242,19 +242,19 @@ * beyond what the individual works permit. Inclusion of a covered work * in an aggregate does not cause this License to apply to the other * parts of the aggregate. - * + * * 6. Conveying Non-Source Forms. - * + * * You may convey a covered work in object code form under the terms * of sections 4 and 5, provided that you also convey the * machine-readable Corresponding Source under the terms of this License, * in one of these ways: - * + * * a) Convey the object code in, or embodied in, a physical product * (including a physical distribution medium), accompanied by the * Corresponding Source fixed on a durable physical medium * customarily used for software interchange. - * + * * b) Convey the object code in, or embodied in, a physical product * (including a physical distribution medium), accompanied by a * written offer, valid for at least three years and valid for as @@ -266,13 +266,13 @@ * more than your reasonable cost of physically performing this * conveying of source, or (2) access to copy the * Corresponding Source from a network server at no charge. - * + * * c) Convey individual copies of the object code with a copy of the * written offer to provide the Corresponding Source. This * alternative is allowed only occasionally and noncommercially, and * only if you received the object code with such an offer, in accord * with subsection 6b. - * + * * d) Convey the object code by offering access from a designated * place (gratis or for a charge), and offer equivalent access to the * Corresponding Source in the same way through the same place at no @@ -285,16 +285,16 @@ * Corresponding Source. Regardless of what server hosts the * Corresponding Source, you remain obligated to ensure that it is * available for as long as needed to satisfy these requirements. - * + * * e) Convey the object code using peer-to-peer transmission, provided * you inform other peers where the object code and Corresponding * Source of the work are being offered to the general public at no * charge under subsection 6d. - * + * * A separable portion of the object code, whose source code is excluded * from the Corresponding Source as a System Library, need not be * included in conveying the object code work. - * + * * A "User Product" is either (1) a "consumer product", which means any * tangible personal property which is normally used for personal, family, * or household purposes, or (2) anything designed or sold for incorporation @@ -307,7 +307,7 @@ * is a consumer product regardless of whether the product has substantial * commercial, industrial or non-consumer uses, unless such uses represent * the only significant mode of use of the product. - * + * * "Installation Information" for a User Product means any methods, * procedures, authorization keys, or other information required to install * and execute modified versions of a covered work in that User Product from @@ -315,7 +315,7 @@ * suffice to ensure that the continued functioning of the modified object * code is in no case prevented or interfered with solely because * modification has been made. - * + * * If you convey an object code work under this section in, or with, or * specifically for use in, a User Product, and the conveying occurs as * part of a transaction in which the right of possession and use of the @@ -326,7 +326,7 @@ * if neither you nor any third party retains the ability to install * modified object code on the User Product (for example, the work has * been installed in ROM). - * + * * The requirement to provide Installation Information does not include a * requirement to continue to provide support service, warranty, or updates * for a work that has been modified or installed by the recipient, or for @@ -334,15 +334,15 @@ * network may be denied when the modification itself materially and * adversely affects the operation of the network or violates the rules and * protocols for communication across the network. - * + * * Corresponding Source conveyed, and Installation Information provided, * in accord with this section must be in a format that is publicly * documented (and with an implementation available to the public in * source code form), and must require no special password or key for * unpacking, reading or copying. - * + * * 7. Additional Terms. - * + * * "Additional permissions" are terms that supplement the terms of this * License by making exceptions from one or more of its conditions. * Additional permissions that are applicable to the entire Program shall @@ -351,41 +351,41 @@ * apply only to part of the Program, that part may be used separately * under those permissions, but the entire Program remains governed by * this License without regard to the additional permissions. - * + * * When you convey a copy of a covered work, you may at your option * remove any additional permissions from that copy, or from any part of * it. (Additional permissions may be written to require their own * removal in certain cases when you modify the work.) You may place * additional permissions on material, added by you to a covered work, * for which you have or can give appropriate copyright permission. - * + * * Notwithstanding any other provision of this License, for material you * add to a covered work, you may (if authorized by the copyright holders of * that material) supplement the terms of this License with terms: - * + * * a) Disclaiming warranty or limiting liability differently from the * terms of sections 15 and 16 of this License; or - * + * * b) Requiring preservation of specified reasonable legal notices or * author attributions in that material or in the Appropriate Legal * Notices displayed by works containing it; or - * + * * c) Prohibiting misrepresentation of the origin of that material, or * requiring that modified versions of such material be marked in * reasonable ways as different from the original version; or - * + * * d) Limiting the use for publicity purposes of names of licensors or * authors of the material; or - * + * * e) Declining to grant rights under trademark law for use of some * trade names, trademarks, or service marks; or - * + * * f) Requiring indemnification of licensors and authors of that * material by anyone who conveys the material (or modified versions of * it) with contractual assumptions of liability to the recipient, for * any liability that these contractual assumptions directly impose on * those licensors and authors. - * + * * All other non-permissive additional terms are considered "further * restrictions" within the meaning of section 10. If the Program as you * received it, or any part of it, contains a notice stating that it is @@ -395,46 +395,46 @@ * License, you may add to a covered work material governed by the terms * of that license document, provided that the further restriction does * not survive such relicensing or conveying. - * + * * If you add terms to a covered work in accord with this section, you * must place, in the relevant source files, a statement of the * additional terms that apply to those files, or a notice indicating * where to find the applicable terms. - * + * * Additional terms, permissive or non-permissive, may be stated in the * form of a separately written license, or stated as exceptions; * the above requirements apply either way. - * + * * 8. Termination. - * + * * You may not propagate or modify a covered work except as expressly * provided under this License. Any attempt otherwise to propagate or * modify it is void, and will automatically terminate your rights under * this License (including any patent licenses granted under the third * paragraph of section 11). - * + * * However, if you cease all violation of this License, then your * license from a particular copyright holder is reinstated (a) * provisionally, unless and until the copyright holder explicitly and * finally terminates your license, and (b) permanently, if the copyright * holder fails to notify you of the violation by some reasonable means * prior to 60 days after the cessation. - * + * * Moreover, your license from a particular copyright holder is * reinstated permanently if the copyright holder notifies you of the * violation by some reasonable means, this is the first time you have * received notice of violation of this License (for any work) from that * copyright holder, and you cure the violation prior to 30 days after * your receipt of the notice. - * + * * Termination of your rights under this section does not terminate the * licenses of parties who have received copies or rights from you under * this License. If your rights have been terminated and not permanently * reinstated, you do not qualify to receive new licenses for the same * material under section 10. - * + * * 9. Acceptance Not Required for Having Copies. - * + * * You are not required to accept this License in order to receive or * run a copy of the Program. Ancillary propagation of a covered work * occurring solely as a consequence of using peer-to-peer transmission @@ -443,14 +443,14 @@ * modify any covered work. These actions infringe copyright if you do * not accept this License. Therefore, by modifying or propagating a * covered work, you indicate your acceptance of this License to do so. - * + * * 10. Automatic Licensing of Downstream Recipients. - * + * * Each time you convey a covered work, the recipient automatically * receives a license from the original licensors, to run, modify and * propagate that work, subject to this License. You are not responsible * for enforcing compliance by third parties with this License. - * + * * An "entity transaction" is a transaction transferring control of an * organization, or substantially all assets of one, or subdividing an * organization, or merging organizations. If propagation of a covered @@ -460,7 +460,7 @@ * give under the previous paragraph, plus a right to possession of the * Corresponding Source of the work from the predecessor in interest, if * the predecessor has it or can get it with reasonable efforts. - * + * * You may not impose any further restrictions on the exercise of the * rights granted or affirmed under this License. For example, you may * not impose a license fee, royalty, or other charge for exercise of @@ -468,13 +468,13 @@ * (including a cross-claim or counterclaim in a lawsuit) alleging that * any patent claim is infringed by making, using, selling, offering for * sale, or importing the Program or any portion of it. - * + * * 11. Patents. - * + * * A "contributor" is a copyright holder who authorizes use under this * License of the Program or a work on which the Program is based. The * work thus licensed is called the contributor's "contributor version". - * + * * A contributor's "essential patent claims" are all patent claims * owned or controlled by the contributor, whether already acquired or * hereafter acquired, that would be infringed by some manner, permitted @@ -484,19 +484,19 @@ * purposes of this definition, "control" includes the right to grant * patent sublicenses in a manner consistent with the requirements of * this License. - * + * * Each contributor grants you a non-exclusive, worldwide, royalty-free * patent license under the contributor's essential patent claims, to * make, use, sell, offer for sale, import and otherwise run, modify and * propagate the contents of its contributor version. - * + * * In the following three paragraphs, a "patent license" is any express * agreement or commitment, however denominated, not to enforce a patent * (such as an express permission to practice a patent or covenant not to * sue for patent infringement). To "grant" such a patent license to a * party means to make such an agreement or commitment not to enforce a * patent against the party. - * + * * If you convey a covered work, knowingly relying on a patent license, * and the Corresponding Source of the work is not available for anyone * to copy, free of charge and under the terms of this License, through a @@ -510,7 +510,7 @@ * covered work in a country, or your recipient's use of the covered work * in a country, would infringe one or more identifiable patents in that * country that you have reason to believe are valid. - * + * * If, pursuant to or in connection with a single transaction or * arrangement, you convey, or propagate by procuring conveyance of, a * covered work, and grant a patent license to some of the parties @@ -518,7 +518,7 @@ * or convey a specific copy of the covered work, then the patent license * you grant is automatically extended to all recipients of the covered * work and works based on it. - * + * * A patent license is "discriminatory" if it does not include within * the scope of its coverage, prohibits the exercise of, or is * conditioned on the non-exercise of one or more of the rights that are @@ -533,13 +533,13 @@ * for and in connection with specific products or compilations that * contain the covered work, unless you entered into that arrangement, * or that patent license was granted, prior to 28 March 2007. - * + * * Nothing in this License shall be construed as excluding or limiting * any implied license or other defenses to infringement that may * otherwise be available to you under applicable patent law. - * + * * 12. No Surrender of Others' Freedom. - * + * * If 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 convey a @@ -549,9 +549,9 @@ * to collect a royalty for further conveying from those to whom you convey * the Program, the only way you could satisfy both those terms and this * License would be to refrain entirely from conveying the Program. - * + * * 13. Use with the GNU Affero General Public License. - * + * * Notwithstanding any other provision of this License, you have * permission to link or combine any covered work with a work licensed * under version 3 of the GNU Affero General Public License into a single @@ -560,14 +560,14 @@ * but the special requirements of the GNU Affero General Public License, * section 13, concerning interaction through a network will apply to the * combination as such. - * + * * 14. Revised Versions of this License. - * + * * The Free Software Foundation may publish revised and/or new versions of * the GNU 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 that a certain numbered version of the GNU General * Public License "or any later version" applies to it, you have the @@ -576,19 +576,19 @@ * Foundation. If the Program does not specify a version number of the * GNU General Public License, you may choose any version ever published * by the Free Software Foundation. - * + * * If the Program specifies that a proxy can decide which future * versions of the GNU General Public License can be used, that proxy's * public statement of acceptance of a version permanently authorizes you * to choose that version for the Program. - * + * * Later license versions may give you additional or different * permissions. However, no additional obligations are imposed on any * author or copyright holder as a result of your choosing to follow a * later version. - * + * * 15. Disclaimer of Warranty. - * + * * 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 @@ -597,9 +597,9 @@ * 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. - * + * * 16. Limitation of Liability. - * + * * IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING * WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS * THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY @@ -609,64 +609,64 @@ * 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. - * + * * 17. Interpretation of Sections 15 and 16. - * + * * If the disclaimer of warranty and limitation of liability provided * above cannot be given local legal effect according to their terms, * reviewing courts shall apply local law that most closely approximates * an absolute waiver of all civil liability in connection with the * Program, unless a warranty or assumption of liability accompanies a * copy of the Program in return for a fee. - * + * * 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 * state the exclusion of warranty; and each file should have at least * the "copyright" line and a pointer to where the full notice is found. - * + * * {one line to give the program's name and a brief idea of what it does.} * Copyright (C) {year} {name of author} - * + * * 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 3 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, see . - * + * * Also add information on how to contact you by electronic and paper mail. - * + * * If the program does terminal interaction, make it output a short * notice like this when it starts in an interactive mode: - * + * * {project} Copyright (C) {year} {fullname} * This program 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, your program's commands * might be different; for a GUI interface, you would use an "about box". - * + * * You should also get your employer (if you work as a programmer) or school, * if any, to sign a "copyright disclaimer" for the program, if necessary. * For more information on this, and how to apply and follow the GNU GPL, see * . - * + * * The GNU 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 @@ -690,8 +690,8 @@ namespace gr { * \ingroup lora * * \details This block creates a UDP server at a specific port - * and pass received UDP datagrams as a pmt::pmt_t blob message. - * The datagrams sent to the UDP server always contain valid + * and passes received UDP datagrams as a pmt::pmt_t blob message. + * The datagrams sent to the UDP server should contain a valid * LoRaTAP header, LoRaPHY header and payload */ class LORA_API message_socket_source : virtual public gr::block @@ -700,16 +700,13 @@ namespace gr { typedef boost::shared_ptr sptr; /*! - * \param addr the address to bind the UDP socket - * \param port the UDP port to wait for packets - * \param mtu the maximum MTU. Used to pre-allocate a maximum packet size - * \param payload_len the payload length in bytes + * \param addr The address to bind the UDP socket + * \param port The UDP port to wait for packets */ - static sptr make(const std::string& addr, uint16_t port, size_t mtu, size_t payload_len); + static sptr make(const std::string& addr, uint16_t port); }; } // namespace lora } // namespace gr #endif /* INCLUDED_LORA_MESSAGE_SOCKET_SOURCE_H */ - diff --git a/lib/message_socket_source_impl.cc b/lib/message_socket_source_impl.cc index 56da694..7ed7683 100644 --- a/lib/message_socket_source_impl.cc +++ b/lib/message_socket_source_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2018 Nikos Karamolegkos. + * Copyright 2018 Nikos Karamolegkos, Pieter Robyns. * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,112 +27,82 @@ #include #include "message_socket_source_impl.h" -namespace gr -{ - namespace lora - { +#define RECEIVE_BUFFER_SIZE 1500 +namespace gr { + namespace lora { message_socket_source::sptr - message_socket_source::make (const std::string& addr, uint16_t port, - size_t mtu, size_t payload_len) - { - return gnuradio::get_initial_sptr ( - new message_socket_source_impl (addr, port, mtu, payload_len)); + message_socket_source::make (const std::string& addr, uint16_t port) { + return gnuradio::get_initial_sptr(new message_socket_source_impl(addr, port)); } /* * The private constructor */ - message_socket_source_impl::message_socket_source_impl ( - const std::string& addr, uint16_t port, size_t mtu, size_t payload_len) : - gr::block ("message_socket_source", - gr::io_signature::make (0, 0, 0), - gr::io_signature::make (0, 0, 0)), - d_addr (addr), - d_udp_port (port), - d_mtu (mtu), - d_payload_len (payload_len), - d_running (true) + message_socket_source_impl::message_socket_source_impl (const std::string& addr, uint16_t port) : + gr::block("message_socket_source", gr::io_signature::make (0, 0, 0), gr::io_signature::make (0, 0, 0)), + d_addr(addr), + d_udp_port(port), + d_running(true) { - message_port_register_out (pmt::mp ("out")); - boost::shared_ptr ( - new boost::thread ( - boost::bind (&message_socket_source_impl::msg_receive_udp, - this))); - + message_port_register_out(pmt::mp("out")); + boost::shared_ptr(new boost::thread(boost::bind (&message_socket_source_impl::msg_receive_udp, this))); } - void - message_socket_source_impl::msg_receive_udp () - { - int sock; - struct sockaddr_in sin; - struct sockaddr client_addr; - socklen_t client_addr_len; - ssize_t ret; - uint8_t *buf; - uint32_t bytes_num; - pmt::pmt_t lora_tap; + void message_socket_source_impl::msg_receive_udp() { + int sock; + struct sockaddr_in sin; + struct sockaddr client_addr; + socklen_t client_addr_len; + ssize_t num_bytes_received; + uint8_t buf[RECEIVE_BUFFER_SIZE]; - if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) { - perror ("opening UDP socket"); - exit (EXIT_FAILURE); - } + if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) { + perror("Error creating UDP socket"); + exit(EXIT_FAILURE); + } - memset (&client_addr, 0, sizeof(struct sockaddr)); - memset (&sin, 0, sizeof(struct sockaddr_in)); - sin.sin_family = AF_INET; - sin.sin_port = htons (d_udp_port); + memset(&client_addr, 0, sizeof(struct sockaddr)); + memset(&sin, 0, sizeof(struct sockaddr_in)); + sin.sin_family = AF_INET; + sin.sin_port = htons(d_udp_port); - if (inet_aton (d_addr.c_str (), &(sin.sin_addr)) == 0) { - printf ("Wrong IP address\n"); - close (sock); - exit (EXIT_FAILURE); - } + if (inet_aton(d_addr.c_str(), &(sin.sin_addr)) == 0) { + printf("Invalid IPv4 address\n"); + close(sock); + exit(EXIT_FAILURE); + } - if (bind (sock, (struct sockaddr *) &sin, sizeof(struct sockaddr_in)) - == -1) { - perror ("UDP bind"); - close (sock); - exit (EXIT_FAILURE); - } + if(bind(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in)) == -1) { + perror("Failed to bind UDP port"); + close(sock); + exit(EXIT_FAILURE); + } - /* All good until now. Allocate buffer memory and proceed */ - buf = new uint8_t[d_mtu]; + while (d_running) { + memset(buf, 0, RECEIVE_BUFFER_SIZE); + num_bytes_received = recvfrom(sock, buf, RECEIVE_BUFFER_SIZE, 0, &client_addr, &client_addr_len); + if (num_bytes_received > 0) { + pmt::pmt_t lora_tap = pmt::make_blob(buf, num_bytes_received); + message_port_pub(pmt::mp("out"), lora_tap); + } else { + perror("Error receiving UDP datagram"); + close(sock); + exit(EXIT_FAILURE); + } + } - while (d_running) { - ret = recvfrom (sock, buf, d_mtu, 0, &client_addr, &client_addr_len); - if (ret > 0) { - bytes_num = (uint32_t) ret; - if (bytes_num - == (sizeof(loratap_header_t) + sizeof(loraphy_header_t) - + d_payload_len)) { - lora_tap = pmt::make_blob (buf, bytes_num); - message_port_pub (pmt::mp ("out"), lora_tap); - } - - } - else { - perror ("UDP recvfrom"); - close (sock); - delete[] buf; - exit (EXIT_FAILURE); - } - } - close (sock); - delete[] buf; - exit (EXIT_SUCCESS); + close(sock); + exit(EXIT_SUCCESS); } /* * Our virtual destructor. */ - message_socket_source_impl::~message_socket_source_impl () - { - d_running = false; - d_thread->join (); + message_socket_source_impl::~message_socket_source_impl() { + d_running = false; + d_thread->join(); } } /* namespace lora */ } /* namespace gr */ - diff --git a/lib/message_socket_source_impl.h b/lib/message_socket_source_impl.h index 1bdcd69..b223871 100644 --- a/lib/message_socket_source_impl.h +++ b/lib/message_socket_source_impl.h @@ -31,27 +31,21 @@ namespace gr namespace lora { - class message_socket_source_impl : public message_socket_source - { + class message_socket_source_impl : public message_socket_source { private: - const std::string d_addr; - const uint16_t d_udp_port; - const size_t d_mtu; - const size_t d_payload_len; - bool d_running; - boost::shared_ptr d_thread; + const std::string d_addr; + const uint16_t d_udp_port; + bool d_running; + boost::shared_ptr d_thread; - - void msg_receive_udp(); + void msg_receive_udp(); public: - message_socket_source_impl (const std::string& addr, uint16_t port, - size_t mtu, size_t payload_len); - ~message_socket_source_impl (); + message_socket_source_impl(const std::string& addr, uint16_t port); + ~message_socket_source_impl(); }; } // namespace lora } // namespace gr #endif /* INCLUDED_LORA_MESSAGE_SOCKET_SOURCE_IMPL_H */ -