Moved out most ob mavl_ into libmavl.

Current libmavl is here:
https://svn.planix.org/rsrch/trunk/libmavl

LICENSE

@@ -1,674 +1,26 @@
-GNU GENERAL PUBLIC LICENSE
+/*
-                       Version 3, 29 June 2007
+ * Copyright 2013,2020, The PLANIX Project
-
+ *
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ * Redistribution and use in source and binary forms, with or without
- Everyone is permitted to copy and distribute verbatim copies
+ * modification, are permitted provided that the following conditions are
- of this license document, but changing it is not allowed.
+ * met:
-
+ *
-                            Preamble
+ * 1. Redistributions of source code must retain the above copyright notice,
-
+ * this list of conditions and the following disclaimer.
-  The GNU General Public License is a free, copyleft license for
+ *
-software and other kinds of works.
+ * 2. Redistributions in binary form must reproduce the above copyright
-
+ * notice, this list of conditions and the following disclaimer in the
-  The licenses for most software and other practical works are designed
+ * documentation and/or other materials provided with the distribution.
-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
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-share and change all versions of a program--to make sure it remains free
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-software for all its users.  We, the Free Software Foundation, use the
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-GNU General Public License for most of our software; it applies also to
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-any other work released this way by its authors.  You can apply it to
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-your programs, too.
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-  When we speak of free software, we are referring to freedom, not
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-price.  Our General Public Licenses are designed to make sure that you
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-have the freedom to distribute copies of free software (and charge for
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-them if you wish), that you receive source code or can get it if you
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-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
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-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)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-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
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(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
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-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
-permission to run the unmodified Program.  The output from running a
-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
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-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
-the covered work, and you disclaim any intention to limit operation or
-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;
-keep intact all notices stating that this License and any
-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
-    additional terms, to the whole of the work, and all its parts,
-    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,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-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
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    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
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    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
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-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
-a modified version of its Corresponding Source.  The information must
-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
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-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
-the User Product in which it has been modified or installed.  Access to a
-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
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-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
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-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
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-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
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-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
-rights granted under this License, and you may not initiate litigation
-(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
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-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
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-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
-receiving the covered work authorizing them to use, propagate, modify
-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
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-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
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-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
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-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
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-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
-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.
-
-  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
-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.
-
-  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 <http://www.gnu.org/licenses/>.
-
-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
-<http://www.gnu.org/licenses/>.
-
-  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
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,8 +1,5 @@
 AC-Tube
 =======
-On Github this is a mirror of 
-https://fossil.planix.org/actube/
-
 Open Source CAPWAP WLC + WTP
 
 Current status: early development.

mod_cisco.project

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CodeLite_Project Name="mod_cisco" InternalType="">
-  <VirtualDirectory Name="src">
-    <VirtualDirectory Name="mod">
-      <VirtualDirectory Name="cisco">
-        <File Name="src/mod/cisco/cisco_out_telnet_ssh.c"/>
-        <File Name="src/mod/cisco/cisco_out_capwap_up.c"/>
-        <File Name="src/mod/cisco/cisco_in_telnet_ssh.c"/>
-        <File Name="src/mod/cisco/cisco_in_radio_administrative_state.c"/>
-        <File Name="src/mod/cisco/cisco_actions_wtp.c"/>
-        <File Name="src/mod/cisco/cisco_out_wtp_descriptor.c"/>
-        <File Name="src/mod/cisco/cisco_out_wtp_administrative_state.c"/>
-        <File Name="src/mod/cisco/cisco_out_ac_descriptor.c"/>
-        <File Name="src/mod/cisco/cw_in_check_disc_req.c"/>
-        <File Name="src/mod/cisco/mod_cisco_ac.c"/>
-        <File Name="src/mod/cisco/cisco_in_ac_descriptor.c"/>
-        <File Name="src/mod/cisco/cisco_out_ac_ipv4_list.c"/>
-        <File Name="src/mod/cisco/cisco_actions_ac.c"/>
-        <File Name="src/mod/cisco/cisco_in_wtp_descriptor.c"/>
-        <File Name="src/mod/cisco/cisco_out_radio_operational_state.c"/>
-        <File Name="src/mod/cisco/cisco_out_wtp_operational_state.c"/>
-        <File Name="src/mod/cisco/cisco_out_manager_ip_addr.c"/>
-        <File Name="src/mod/cisco/cisco_in_spam_vendor_specific.c"/>
-        <File Name="src/mod/cisco/cisco_in_radio_operational_state.c"/>
-        <File Name="src/mod/cisco/cisco_out_board_data_options.c"/>
-        <File Name="src/mod/cisco/cisco80211_out_wtp_radio_configuration.c"/>
-        <File Name="src/mod/cisco/cisco_in_add_wlan.c"/>
-        <File Name="src/mod/cisco/cisco80211_in_mac_operation.c"/>
-        <File Name="src/mod/cisco/cisco80211_in_wtp_radio_configuration.c"/>
-        <File Name="src/mod/cisco/cisco80211.h"/>
-        <File Name="src/mod/cisco/cisco.h"/>
-        <File Name="src/mod/cisco/cisco_out_ap_timesync.c"/>
-        <File Name="src/mod/cisco/mod_cisco_wtp.c"/>
-        <File Name="src/mod/cisco/cisco80211.c"/>
-        <File Name="src/mod/cisco/mod_cisco.h"/>
-        <File Name="src/mod/cisco/capwap_cisco.h"/>
-        <File Name="src/mod/cisco/cisco_out_radio_generic.c"/>
-        <File Name="src/mod/cisco/cisco_out_capwap_local_ip_address.c"/>
-        <File Name="src/mod/cisco/cisco_out_lw_path_mtu.c"/>
-        <File Name="src/mod/cisco/lwapp_cisco.h"/>
-        <File Name="src/mod/cisco/cisco_in_ap_regulatory_domain.c"/>
-      </VirtualDirectory>
-    </VirtualDirectory>
-  </VirtualDirectory>
-  <Description/>
-  <Dependencies/>
-  <Dependencies Name="Debug"/>
-  <Dependencies Name="Release"/>
-  <Settings Type="Dynamic Library">
-    <GlobalSettings>
-      <Compiler Options="" C_Options="" Assembler="">
-        <IncludePath Value="."/>
-      </Compiler>
-      <Linker Options="">
-        <LibraryPath Value="."/>
-      </Linker>
-      <ResourceCompiler Options=""/>
-    </GlobalSettings>
-    <Configuration Name="Debug" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
-        <IncludePath Value="."/>
-      </Compiler>
-      <Linker Options="" Required="yes"/>
-      <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Debug" Command="$(WorkspacePath)/src/wtp/wtp" CommandArguments="-dall -mcisco -ccisco.ktv" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/src/wtp/" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
-      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
-        <![CDATA[]]>
-      </Environment>
-      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
-        <DebuggerSearchPaths/>
-        <PostConnectCommands/>
-        <StartupCommands/>
-      </Debugger>
-      <PreBuild/>
-      <PostBuild/>
-      <CustomBuild Enabled="yes">
-        <RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
-        <CleanCommand>make clean</CleanCommand>
-        <BuildCommand>make</BuildCommand>
-        <PreprocessFileCommand/>
-        <SingleFileCommand/>
-        <MakefileGenerationCommand/>
-        <ThirdPartyToolName>None</ThirdPartyToolName>
-        <WorkingDirectory>$(WorkspacePath)/src/mod/cisco</WorkingDirectory>
-      </CustomBuild>
-      <AdditionalRules>
-        <CustomPostBuild/>
-        <CustomPreBuild/>
-      </AdditionalRules>
-      <Completion EnableCpp11="no" EnableCpp14="no">
-        <ClangCmpFlagsC/>
-        <ClangCmpFlags/>
-        <ClangPP/>
-        <SearchPaths/>
-      </Completion>
-    </Configuration>
-    <Configuration Name="Release" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
-        <IncludePath Value="."/>
-      </Compiler>
-      <Linker Options="-O2" Required="yes"/>
-      <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
-      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
-        <![CDATA[]]>
-      </Environment>
-      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
-        <DebuggerSearchPaths/>
-        <PostConnectCommands/>
-        <StartupCommands/>
-      </Debugger>
-      <PreBuild/>
-      <PostBuild/>
-      <CustomBuild Enabled="yes">
-        <RebuildCommand/>
-        <CleanCommand>make clean</CleanCommand>
-        <BuildCommand>make</BuildCommand>
-        <PreprocessFileCommand/>
-        <SingleFileCommand/>
-        <MakefileGenerationCommand/>
-        <ThirdPartyToolName>None</ThirdPartyToolName>
-        <WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
-      </CustomBuild>
-      <AdditionalRules>
-        <CustomPostBuild/>
-        <CustomPreBuild/>
-      </AdditionalRules>
-      <Completion EnableCpp11="no" EnableCpp14="no">
-        <ClangCmpFlagsC/>
-        <ClangCmpFlags/>
-        <ClangPP/>
-        <SearchPaths/>
-      </Completion>
-    </Configuration>
-  </Settings>
-</CodeLite_Project>

src/CWConfig.mak

@@ -1,4 +1,4 @@
-include ../Config.mak
+include ../Config.default.mak
 
 WITH_GNUTLS=1
-WITH_OPENSSL=1
+WITH_OPENSSL=0

src/Config.default.mak

@@ -7,6 +7,9 @@
 #OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl
 #OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/
 
+
+ARCH != uname -m
+
 OPENSSL_LIBS=-lssl -lcrypto #-ldl
 OPENSSL_CFLAGS=
 

src/Defs.mak

@@ -1,5 +1,9 @@
-ifndef ARCH
+#.ifndef ARCH
-	ARCH = $(shell uname -m)
+
-endif
+ARCH!=uname -m
+KERNEL!=uname -s
+
+
+#.endif
 
 

src/WtpConfig.mak

@@ -4,7 +4,7 @@ include ../Config.mak
 # Define witch SSL library to use
 # OPENSSL or GNUTLS
 #
-SSL_LIBRARY=OPENSSL
+SSL_LIBRARY=GNUTLS
 
 CFLAGS += -I/usr/include/libnl3
 CFLAGS += -I../contrib/uci

src/ac/Makefile

@@ -11,7 +11,6 @@ OBJS = \
 	discovery_cache.o\
 	shell.o\
 
-ARCH != uname -m
 PRG=actube
 LIBPATH=-L../../lib/$(ARCH)/ -L/usr/local/lib -L/usr/lib 
 

src/cw/Makefile

@@ -1,41 +1,6 @@
 include ../Defs.mak
-include ../CWConfig.mak
--include ../Config.local.mak
-include ../Macros.mak
 
 
-LIBDIR		:= ../../lib
-LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
-OBJDIR		:= ../../obj/cw/$(ARCH)
-
-SNAME		:= $(LIBARCHDIR)/libcw.a
-DNAME		:= $(LIBARCHDIR)/libcw.so
-
-LIBS=
-
-ifeq ($(WITH_OPENSSL),1)
-CFLAGS+=$(OPENSSL_CFLAGS)
-CFLAGS+=-DWITH_OPENSSL
-DTLSSRC += dtls_openssl.c \
-	dtls_openssl_accept.c \
-	dtls_openssl_connect.c \
-	dtls_openssl_get_cipher.c \
-	dtls_openssl_bio.c 
-LIBS+=-lssl
-endif
-
-ifeq ($(WITH_GNUTLS),1)
-CFLAGS+=$(GNUTLS_CFLAGS)
-CFLAGS+=-DWITH_GNUTLS
-DTLSSRC+= dtls_gnutls.c \
-	dtls_gnutls_accept.c \
-	dtls_gnutls_connect.c \
-	dtls_gnutls_bio.c \
-	dtls_gnutls_get_cipher.c \
-	dtls_gnutls_get_peers_cert.c
-LIBS+=-lgnutls
-endif
-
 
 CWSRC=\
 	cw_check_missing_mand.c\
@@ -156,32 +121,6 @@ LWSRC=\
 	lw_put_sockaddr.c\
 	lw_readelem_wtp_name.c\
 
-MAVLSRC=\
-	mavl_add.c\
-	mavl_add_ptr.c\
-	mavl_cmpstr.c\
-	mavl_create.c\
-	mavl_del_all.c\
-	mavl_del.c\
-	mavl_destroy.c\
-	mavl_foreach.c\
-	mavl_foreach_lr.c\
-	mavl_freeptr.c\
-	mavl_get.c\
-	mavl_get_ext.c\
-	mavl_get_node.c\
-	mavl_get_node_cmp..c\
-	mavl_get_ptr.c\
-	mavliter_get.c\
-	mavliter_get_ptr.c\
-	mavliter_init.c\
-	mavliter_next.c\
-	mavliter_seek.c\
-	mavliter_seek_set.c\
-	mavl_merge.c\
-	mavl_replace.c\
-	mavl_replace_data.c\
-
 
 MLISTSRC=\
 	mlist_append.c\
@@ -275,60 +214,53 @@ RADIOSRC=\
 	cw_out_radio_generic_struct.c\
 	cw_read_radio_generic.c\
 
+MAVLSRC=\
+	mavl_get_ptr.c\
+	mavl_insert_ptr.c\
+	mavl_replace.c\
+	mavl_merge.c\
+	mavliter_get_ptr.c\
+	mavl_cmpstr.c\
+
+
+
+DTLSSRC += dtls_openssl.c \
+	dtls_openssl_accept.c \
+	dtls_openssl_connect.c \
+	dtls_openssl_get_cipher.c \
+	dtls_openssl_bio.c 
+LIBS+=-lssl
+
+#DTLSSRC+= dtls_gnutls.c \
+#	dtls_gnutls_accept.c \
+#	dtls_gnutls_connect.c \
+#	dtls_gnutls_bio.c \
+#	dtls_gnutls_get_cipher.c \
+#	dtls_gnutls_get_peers_cert.c
+#LIBS+=-lgnutls
+
 
 #SRC=$(wildcard *.c)
-SRC = $(CWSRC) $(LWSRC) $(MAVLSRC) $(MLISTSRC) $(SOCKSRC) $(LOGSRC) $(DTLSSRC) $(RADIOSRC) $(KTVSRC) $(MISCSRC)
+SOURCES = $(CWSRC) $(LWSRC) $(MAVLSRC) $(MLISTSRC) $(SOCKSRC) \
-
+	  $(LOGSRC) $(DTLSSRC) $(RADIOSRC) $(KTVSRC) $(MISCSRC) 
-OBJS=$(patsubst %.c,%.o,$(SRC))
-OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS))
-
-
-all: $(SNAME) $(DNAME)
-
-
-CFLAGS += $(GNUTLS_CFLAGS) \
-	  -DWITH_CW_LOG \
-	  -DWITH_CW_LOG_DEBUG \
-	  -DWITH_DTLS 
-
-
-$(OBJDIR)/%.o:%.c
-	@mkdir -p $(OBJDIR)
-	@echo "  $(CC) "$<
-	@$(CC) -c $(CFLAGS) $< -o $@
-
-$(SNAME) : $(OBJS) 
-	@mkdir -p $(LIBARCHDIR)
-	@echo "  $(AR) $(SNAME)"
-	@$(AR) rcs $(SNAME) $(OBJS) 
-
-$(DNAME) : $(OBJS) 
-	@mkdir -p $(LIBARCHDIR)
-	@echo "  $(LD) $(DNAME)"
-	@$(LD) $(LDFLAGS) -shared -o $(DNAME) $(OBJS) $(LIBS)
-
-
-SRCS = $(OBJS:.o=.c) 
-DEPS := $(OBJS:.o=.d)
-
-
-.PHONY: deps clean clean_libs libs
 
 
 
-clean: 
+
-	$(RM) $(OBJDIR)/*
+LIBDIR          := ../../lib
-	$(RM) $(DNAME)
+LIBARCHDIR      := $(LIBDIR)/$(KERNEL)/$(ARCH)
-	$(RM) $(SNAME)
+OBJDIR          := ../../obj/cw/$(KERNEL)/$(ARCH)
+
+SNAME           := $(LIBARCHDIR)/libcw.a
+DNAME           := $(LIBARCHDIR)/libcw.so
+
+CFLAGS+=-fPIC -DUSE_OPENSSL -I../contrib/openssl-1.1.1f/include/ -O0 
+CFLAGS+=-g -I/home/tube/v/rsrch/libmavl
+
+all: $(SNAME) $(DNAME) 
+static: $(SNAME)
+dynamic: $(DNAME)
 	
 
-clean_deps:
+include ../lib.mk
-	$(DEPS) 
-	
-deps:  
-	echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > .depend
-	makedepend $(SRC) -f.depend -p$(OBJDIR)/
-
-
--include .depend
 

src/cw/capwap.h

@@ -394,14 +394,12 @@
 //#define CAPWAP_CIPHER "AES128-SHA"
 */
 
-/*
+
-#ifdef WITH_GNUTLS
+#ifdef USE_OPENSSL
-#define CAPWAP_CIPHER	"+RSA:+AES-128-CBC:+SHA1:"
+	#define CAPWAP_CIPHER	"ALL"
+#else
+	#define CAPWAP_CIPHER	"+RSA:+AES-128-CBC:+SHA1:"
 #endif
-#ifdef WITH_OPENSSL
-#define CAPWAP_CIPHER	"ALL"
-#endif
-*/
 
 
 /**

src/cw/conn_process_packet.c

@@ -206,7 +206,7 @@ void cw_read_elem(struct cw_ElemHandler * handler, struct conn * conn,
 	
 	handler->type->to_str(result,str,30);
 	printf("Read %d-%s: %s %s\n", handler->id, handler->name, handler->key, str);
-	//mavl_add(conn->remote_cfg
+	//mavl_insert(conn->remote_cfg
 }
 */
 
@@ -290,7 +290,7 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 	
 	/* Search message */
 	
-	message = mavl_find(conn->msgset->msgdata,&search);
+	message = mavl_get(conn->msgset->msgdata,&search);
 		
 	result_code = 0;
 	

src/cw/conn_send_msg.c

@@ -3,6 +3,7 @@
 #include "dbg.h"
 
 #define CW_MODE_ZYXEL 7
+extern cw_send_msg(struct conn * conn,uint8_t * msg);
 
 int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
 {
@@ -14,6 +15,7 @@ int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
 
 	cw_dbg_msg(DBG_MSG_OUT, conn,rawmsg, packetlen,(struct sockaddr*)&conn->addr);
 
+
 	/* Zyxel doesn't count msg element length from
 	   behind seqnum */
 	if (conn->capwap_mode == CW_MODE_ZYXEL){
@@ -28,7 +30,31 @@ int conn_send_msg(struct conn * conn, uint8_t *rawmsg)
 	hlen = cw_get_hdr_hlen(rawmsg)*4;
 
 	mtu = conn->mtu;
-mtu = 800;
+mtu = 440;	
+	mtu = mtu >> 3;
+	mtu = mtu << 3;
+	
+	printf("packetlenX = %d (%d)\n",packetlen,hlen);
+	 int offset = cw_get_hdr_msg_offset(rawmsg);
+	return cw_send_msg(conn,rawmsg+offset);
+
+
+	if (packetlen>mtu){
+		cw_set_hdr_flags(ptr,CAPWAP_FLAG_HDR_F,1);
+		cw_set_dword(ptr+4, conn->fragid<<16 | fragoffset<<3 );
+		cw_dbg_pkt(DBG_PKT_OUT,conn,ptr,mtu,(struct sockaddr*)&conn->addr);
+		if (conn->write(conn,ptr,mtu)<0)
+			return -1;
+		cw_set_hdr_flags(ptr,CAPWAP_FLAG_HDR_M,0);
+		cw_set_hdr_flags(ptr,CAPWAP_FLAG_HDR_W,0);
+
+		fragoffset+=(mtu-hlen)/8;
+		hlen = 8;
+		ptr += mtu-hlen;
+		packetlen-=mtu-hlen;
+		memcpy(ptr,rawmsg,hlen);
+
+	}
 
 	while (packetlen>mtu){
 		

src/cw/connlist.c

@@ -155,7 +155,7 @@ struct conn * connlist_add ( struct connlist * cl, struct conn * conn )
 			return NULL;
 			
 	conn->connlist = cl;
-	return mavl_add_ptr ( cl->by_addr, conn );
+	return mavl_insert_ptr ( cl->by_addr, conn );
 }
 
 struct conn * connlist_get_by_session_id ( struct connlist *cl, struct conn * conn )
@@ -165,7 +165,7 @@ struct conn * connlist_get_by_session_id ( struct connlist *cl, struct conn * co
 
 struct conn * connlist_add_by_session_id ( struct connlist * cl, struct conn * conn )
 {
-	return mavl_add_ptr ( cl->by_session_id, conn );
+	return mavl_insert_ptr ( cl->by_session_id, conn );
 }
 
 void connlist_remove ( struct connlist *cl, struct conn * conn )

src/cw/cw.h

@@ -98,8 +98,13 @@
 /* macros to acces transport header values */
 
 #define cw_get_hdr_preamble(th) (th[0])
-#define cw_get_hdr_fragid(th) ((ntohl((((uint32_t*)th)[1]) >> 16) & 0xffff))
+
-#define cw_get_hdr_fragoffset(th) ((ntohl((((uint32_t*)th)[1]) >> 3) & 0x1fff))
+#define cw_get_hdr_fragid(th)\
+	(((ntohl(*(((uint32_t*)(th))+1))) >> 16) & 0xffff)
+
+#define cw_get_hdr_fragoffset(th)\
+	(((ntohl(*(((uint32_t*)(th))+1))) >> 3) & 0x1fff)
+
 #define cw_get_hdr_rid(th) ((ntohl((((uint32_t*)th)[0]) >> 14) & 0x1f))
 #define cw_get_hdr_wbid(th) ((ntohl(((uint32_t*)th)[0]) >> 9) & 0x1f)
 #define cw_get_hdr_hlen(th) ((ntohl(((uint32_t*)th)[0]) >> 19) & 0x1f)

src/cw/cw_inline.c

@@ -111,7 +111,7 @@ int cw_set_hdr_rmac(uint8_t * th, bstr_t rmac)
 	memcpy(cw_get_hdr_rmac(th), rmac, rmac_len + 1);
 	cw_set_hdr_flags(th, CAPWAP_FLAG_HDR_M, 1);
 
-	hlen = 4 + rmac_len / 4;
+	hlen = 2 + rmac_len / 4;
 
 	if (rmac_len % 4 != 0) {
 		hlen++;

src/cw/cw_ktv_add.c

@@ -10,6 +10,7 @@ cw_KTV_t * cw_ktv_add(mavl_t kvtstore, const char *key, const struct cw_Type *ty
 {
 	cw_KTV_t mdata, *mresult;
 	int exists;
+printf("KTV ADD: %s\n",key);
 
 	mdata.key=cw_strdup(key);
 	mdata.valguard=valguard;
@@ -29,8 +30,10 @@ cw_KTV_t * cw_ktv_add(mavl_t kvtstore, const char *key, const struct cw_Type *ty
 		return NULL;
 	}
 
+printf("MAVLCOUNT: %d - %s\n",kvtstore->count, mdata.key);
+
 	mavl_del(kvtstore,&mdata);
-	mresult = mavl_add(kvtstore, &mdata, &exists);
+	mresult = mavl_insert(kvtstore, &mdata, &exists);
 	if (exists){
 		cw_log(LOG_ERR, "Element already exists %s", key);
 		/* element already exists */

src/cw/cw_ktv_add_from_str.c

@@ -31,7 +31,7 @@ const char * cw_ktv_add_from_str(mavl_t kvtstore, const char *key,
 		return NULL;
 	}
 	
-	mresult = mavl_add(kvtstore, &mdata, &exists);
+	mresult = mavl_insert(kvtstore, &mdata, &exists);
 	if (exists){
 		cw_log(LOG_ERR, "Element already exists %s", key);
 		/* element already exists */

src/cw/cw_ktv_idx_get.c

@@ -24,19 +24,19 @@ void * ktvn(struct mavl *t ,const void *search)
 		
 		if (rc<0){
 			/*lastl = n;*/
-			if (n->left==NULL){
+			if (n->s[0]==NULL){
 				return mavlnode_dataptr(lastb);
 				
 			}
-			n=n->left;
+			n=n->s[0];
 		}
 		else{
 			lastb=n;
-			if(n->right==NULL){
+			if(n->s[1]==NULL){
 				return mavlnode_dataptr(lastb);
 				
 			}
-			n=n->right;
+			n=n->s[1];
 		}
 	}
 	return NULL;

src/cw/cw_process_element.c

@@ -35,7 +35,7 @@ int cw_process_element(struct cw_ElemHandlerParams *params, int proto, int vendo
 	elem_data_search.id=elem_id;
 	elem_data_search.proto=proto;
 	elem_data_search.vendor=vendor;
-	elem_data = mavl_find(params->msgdata->elements_tree,&elem_data_search);
+	elem_data = mavl_get(params->msgdata->elements_tree,&elem_data_search);
 	if (!elem_data){
 		cw_dbg(DBG_ELEM_ERR, "Element %d - %s, not allowed here", 
 			elem_id, handler->name);

src/cw/dtls.h

@@ -24,7 +24,14 @@
 
 
 
-#ifdef WITH_GNUTLS
+#ifdef USE_OPENSSL
+	#include "dtls_openssl.h"
+	#define dtls_init dtls_openssl_init
+	#define dtls_accept dtls_openssl_accept
+	#define dtls_connect dtls_openssl_connect
+	#define dtls_shutdown dtls_openssl_shutdown
+	#define dtls_get_cipher dtls_openssl_get_cipher
+#else
 	#include "dtls_gnutls.h"
 	#define dtls_init dtls_gnutls_init
 	#define dtls_accept dtls_gnutls_accept
@@ -34,15 +41,6 @@
 	#define dtls_get_peers_cert dtls_gnutls_get_peers_cert
 #endif
 
-#ifdef WITH_OPENSSL
-	#include "dtls_openssl.h"
-	#define dtls_init dtls_openssl_init
-	#define dtls_accept dtls_openssl_accept
-	#define dtls_connect dtls_openssl_connect
-	#define dtls_shutdown dtls_openssl_shutdown
-	#define dtls_get_cipher dtls_openssl_get_cipher
-#endif
-
 
 
 #endif

src/cw/dtls_openssl.c

@@ -36,7 +36,7 @@
 #include "sock.h"
 
 
-#ifdef WITH_CW_LOG_DEBUG
+
 static const char * ssl_version2str(int version)
 {
 	switch(version){
@@ -48,8 +48,8 @@ static const char * ssl_version2str(int version)
 			return "TLSv1";
 		case DTLS1_VERSION:
 			return "DTLSv1";
-/*		case DTLS1_2_VERSION:
+		case DTLS1_2_VERSION:
-			return "DTLSv1.2"; */
+			return "DTLSv1.2";
 	}
 	return "Version unknown";
 }
@@ -65,9 +65,8 @@ static void dtls_debug_cb(int write_p,int version,int type, const void * buf,siz
 		s += sprintf(s,"SSL msg in: ");
 
 	s+=sprintf(s,"type = %d (0x%02X), %s (%08x), len = %d",type,type,ssl_version2str(version),version,(int)len);
-/*	cw_dbg(DBG_DTLS_DETAIL,buffer); */
+	cw_dbg(DBG_DTLS_DETAIL,buffer); 
 }
-#endif
 
 
 static void dtls_info_cb (const SSL *ssl, int where, int ret)
@@ -320,7 +319,17 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
 		return NULL;
 	}
 
+	rc = SSL_CTX_get_security_level(d->ctx);
+	printf("Security Level is %d\n");
+
+	SSL_CTX_set_security_level(d->ctx,0);
+	printf("Security Level is %d\n");
+
 	
+
+/*	SSL_CTX_set_min_proto_version	(d->ctx,  DTLS1_VERSION);*/
+	SSL_CTX_set_max_proto_version	(d->ctx,  DTLS1_VERSION);
+
 	rc = SSL_CTX_set_cipher_list(d->ctx, conn->dtls_cipher);
 	if (!rc){
 		dtls_openssl_log_error(0,rc,"DTLS setup cipher error:");
@@ -357,11 +366,11 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
 
 
 	/* setup debugging */
-#ifdef WITH_CW_LOG_DEBUG
+/*#ifdef WITH_CW_LOG_DEBUG*/
 	SSL_CTX_set_msg_callback(d->ctx,dtls_debug_cb);
 	SSL_CTX_set_info_callback (d->ctx, dtls_info_cb);
 	
-#endif
+/*#endif*/
 
 
 
@@ -373,7 +382,6 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
 
 	rc = SSL_CTX_load_verify_locations(d->ctx,"../../ssl/root-ca.pem",NULL);
 
-	
 
 
 /*//	SSL_CTX_set_session_cache_mode(d->ctx, SSL_SESS_CACHE_BOTH);*/
@@ -382,10 +390,10 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
 
 
 	SSL_CTX_set_timeout(d->ctx,30);
-/*
+
-//	rc =SSL_CTX_set_max_proto_version (d->ctx,DTLS1_VERSION);
+	rc =SSL_CTX_set_max_proto_version (d->ctx,DTLS1_VERSION);
-//	printf("MAXMAMX = %d\n",rc);
+	printf("MAXMAMX = %d\n",rc);
-*/
+
 
 /*
 //	SSL_CTX_set_verify(d->ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, dtls_verify_callback);
@@ -558,7 +566,7 @@ int dtls_openssl_generate_cookie(SSL *ssl, unsigned char *cookie, unsigned int *
 
 }
 
-int dtls_openssl_verify_cookie(SSL *ssl, unsigned char *cookie, unsigned int len)
+int dtls_openssl_verify_cookie(SSL *ssl, const unsigned char *cookie, unsigned int len)
 {
 	char sock_buf[SOCK_ADDR_BUFSIZE];
 	char sock_buf2[SOCK_ADDR_BUFSIZE];	

src/cw/dtls_openssl.h

@@ -51,7 +51,7 @@ extern int dtls_openssl_init();
 struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SSL_METHOD * method, BIO_METHOD * bio);
 extern int dtls_openssl_psk_key2bn(const char *psk_key, unsigned char *psk, unsigned int max_psk_len);
 extern int dtls_openssl_generate_cookie(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len);
-extern int dtls_openssl_verify_cookie(SSL *ssl, unsigned char *cookie, unsigned int cookie_len);
+extern int dtls_openssl_verify_cookie(SSL *ssl, const unsigned char *cookie, unsigned int cookie_len);
 
 extern int dtls_openssl_read(struct conn * conn, uint8_t *buffer, int len);
 extern int dtls_openssl_write(struct conn * conn, const uint8_t *buffer, int len);

src/cw/dtls_openssl_bio.c

@@ -37,9 +37,28 @@
 
 BIO_METHOD *dtls_openssl_bio_method()
 {
-	static BIO_METHOD bio_methods;
+	int index = BIO_get_new_index() ;
+/*	index = BIO_TYPE_DGRAM;*/
+	cw_dbg(DBG_DTLS_BIO, "Creating new OpenSSL BIO Methods");
 
-	bio_methods.type = BIO_TYPE_DGRAM;
+	BIO_METHOD * bio_methods;
+	bio_methods = BIO_meth_new(index,"CW Packet");
+	if (!bio_methods){
+		return NULL;
+	}
+
+	BIO_meth_set_write(bio_methods,dtls_openssl_bio_write);
+	BIO_meth_set_read(bio_methods,dtls_openssl_bio_read);
+	BIO_meth_set_puts(bio_methods,dtls_openssl_bio_puts);
+	BIO_meth_set_ctrl(bio_methods,dtls_openssl_bio_ctrl);
+	BIO_meth_set_create(bio_methods,dtls_openssl_bio_new);
+	BIO_meth_set_destroy(bio_methods,dtls_openssl_bio_free);
+
+
+/*	bio_methods = BIO_mth_new(BIO_TYPE_DGRAM,"CW Packet");*/
+
+
+/*	bio_methods.type = BIO_TYPE_DGRAM;
 	bio_methods.name = "CW packet";
 	bio_methods.bwrite = dtls_openssl_bio_write;
 	bio_methods.bread = dtls_openssl_bio_read;
@@ -49,20 +68,23 @@ BIO_METHOD *dtls_openssl_bio_method()
 	bio_methods.create = dtls_openssl_bio_new;
 	bio_methods.destroy = dtls_openssl_bio_free;
 	bio_methods.callback_ctrl = 0;
+*/
 
-	return &bio_methods;
+	return bio_methods;
 }
 
 int dtls_openssl_bio_write(BIO * b, const char *data, int len)
 {
-	struct conn *conn = b->ptr;
+/*	struct conn *conn = b->ptr;*/
+	struct conn *conn = BIO_get_data(b);
 	return dtls_bio_write(conn, data, len);
 }
 
 
 int dtls_openssl_bio_read(BIO * b, char *out, int maxlen)
 {
-	struct conn *conn = b->ptr;
+	/*struct conn *conn = b->ptr;*/
+	struct conn *conn = BIO_get_data(b);
 	return dtls_bio_read(conn, out, maxlen);
 }
 
@@ -70,11 +92,14 @@ int dtls_openssl_bio_read(BIO * b, char *out, int maxlen)
 
 int dtls_openssl_bio_new(BIO * bi)
 {
-
+	/*
 	bi->init = 1;
 	bi->num = 0;
 	bi->flags = 0;
 	bi->ptr = NULL;
+*/
+	BIO_set_init(bi,1);
+
 	cw_dbg(DBG_DTLS_BIO, "Creating new OpenSSL BIO");
 	return 1;
 }
@@ -98,7 +123,8 @@ int dtls_openssl_bio_free(BIO * bio)
 
 long dtls_openssl_bio_ctrl(BIO * b, int cmd, long num, void *ptr)
 {
-	struct conn *conn = b->ptr;
+	/*struct conn *conn = b->ptr;*/
+	struct conn *conn = BIO_get_data(b);
 
 	long ret = 1;
 	switch (cmd) {

src/cw/dtls_openssl_connect.c

@@ -7,21 +7,6 @@
 #include "cw_util.h"
 #include "timer.h"
 
-/*
-static BIO_METHOD bio_methods = {
-	BIO_TYPE_DGRAM,
-	"cw packet",
-	dtls_openssl_bio_write,
-	dtls_openssl_bio_read,
-	dtls_openssl_bio_puts,
-	NULL, 			// dgram_gets
-	dtls_openssl_bio_ctrl,
-	dtls_openssl_bio_new,
-	dtls_openssl_bio_free,
-	NULL,
-};
-*/
-
  unsigned int psk_client_cb(SSL * ssl,
 				  const char *hint,
 				  char *identity,
@@ -48,11 +33,23 @@ dtls_openssl_connect(struct conn *conn)
 	struct dtls_openssl_data *d;
 	int rc;
 	time_t timer;
+
+	cw_dbg(DBG_DTLS_BIO, "DTLS Connect call");
+
+	BIO_METHOD * biomethod = dtls_openssl_bio_method();
+	if (!biomethod){
+		cw_dbg(DBG_DTLS_BIO, "ERROR: Creating new OpenSSL BIO");
+		return 0;
+	}
+
+	cw_dbg(DBG_DTLS_BIO, "DTLS Connect call 1");
 	
 	if (!conn->dtls_data)
 		conn->dtls_data =
-		    dtls_openssl_data_create(conn, DTLSv1_client_method(),
+		    dtls_openssl_data_create(conn, DTLS_client_method(),
-					     dtls_openssl_bio_method());
+					     biomethod);
+
+	cw_dbg(DBG_DTLS_BIO, "DTLS Connect call 2");
 
 	d = (struct dtls_openssl_data *) conn->dtls_data;
 	if (!d)
@@ -63,6 +60,7 @@ dtls_openssl_connect(struct conn *conn)
 		SSL_set_psk_client_callback(d->ssl, psk_client_cb);
 */
 
+	cw_dbg(DBG_DTLS_BIO, "DTLS Connect call 3");
 
 	errno =0;
 	timer = cw_timer_start(10);
@@ -70,6 +68,7 @@ dtls_openssl_connect(struct conn *conn)
 		rc = SSL_connect(d->ssl);
 	}while(rc!=1 && errno==EAGAIN && !cw_timer_timeout(timer));
 
+	cw_dbg(DBG_DTLS_BIO, "DTLS Connect call 4 %d ",rc);
 
 	if (rc == 1) {
 		cw_dbg(DBG_DTLS,"SSL connect successfull!");
@@ -77,6 +76,7 @@ dtls_openssl_connect(struct conn *conn)
 		conn->write = dtls_openssl_write;
 		return 1;
 	}
+	cw_dbg(DBG_DTLS_BIO, "DTLS Connect call 5");
 
 	rc = dtls_openssl_log_error(d->ssl, rc, "DTLS connect");
 	return 0;

src/cw/intavltree.c

@@ -31,5 +31,5 @@ int * intavltree_add(struct mavl * t, int val)
 	if (!v)
 		return NULL;
 	*v=val;
-	return mavl_add(t,v,NULL);
+	return mavl_insert(t,v,NULL);
 }

src/cw/intavltree.h

@@ -1,7 +1,7 @@
 #ifndef __INTAVLTREE_H
 #define __INTAVLTREE_H
 
-#include "mavl.h"
+#include <mavl.h>
 
 extern struct mavl * intavltree_create();
 typedef struct mavl * intavltree_t;

src/cw/ktv.h

@@ -4,7 +4,9 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "mavl.h"
+#include <mavl.h>
+#include "mavltypes.h"
+
 #include "bstr.h"
 
 

src/cw/mavl.h

@@ -1,298 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap 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.
-
-    libcapwap 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file mavl.h
- * @brief MAVL, Mini AVL Tree,
- * Yet another AVL Tree implementation
- */
-
-
-/**
- * @addtogroup ALGOS
- * @{
- * 
- * @defgroup MAVL Mavl Tree
- * @{
- */
-
-
-
-#ifndef __MAVL_H
-#define __MAVL_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <stdint.h>
-
-
-
-/** Maximum AVL Tree depth.
-    The number of nodes is calculated by 2^depth.
-    So a value of 32 should be enough for around 4
-    billion nodes. */
-#define MAVL_MAX_DEPTH	32
-
-
-
-
-/**
- * Defines the structure of an AVL Node.
- */
-struct mavlnode {
-	/** Pointer to data, that belongs to the node */
-	
-	/*	union mavldata data; */
-	
-	/** Pointer to left son*/
-	struct mavlnode *left;
-	/** Pointer to right son*/
-	struct mavlnode *right;
-	/** AVL balance */
-	int bal;
-};
-
-
-
-/**
- * AVL Tree
- */
-struct mavl {
-	/** Pointer to root node */
-	struct mavlnode *root;
-	/** Compare function */
-	int ( *cmp ) ( const void *, const void * );
-	/** Delete element function */
-	void ( *del ) ( void * );
-	/** Number of elements currently stored in the tree */
-	int count;
-	/** size of data appended to each mavlnode element.
-	 * used to allocate space in #mavl_add. */
-	size_t data_size;
-};
-
-
-/**
- * MAVL AVL Tree type
- */
-typedef struct mavl * mavl_t;
-
-#define MAVL_FIND_FIRST 1
-#define MAVL_FIND_LAST  2
-
-/**
- * @param node node 
- */
-#define mavlnode_dataptr(node) ((void*)(((uint8_t*)(node))+sizeof(struct mavlnode)))
-
-struct mavl *mavl_create ( int ( *cmp ) ( const void *, const void * ),
-                           void ( *del ) ( void * ), size_t data_size );
-
-void *mavl_add ( struct mavl *t, const void *data, int *exists );
-
-/*void *mavl_add ( struct mavl *t,  const void *data );*/
-void * mavl_get ( struct mavl *t , const void *data );
-void * mavl_get_ext(struct mavl *t ,const void *search, int mode);
-
-void *mavl_del ( struct mavl *t, const void *data );
-void *mavl_replace ( struct mavl *t, const void *data, int * result );
-void mavl_destroy ( struct mavl *t );
-void mavl_del_all ( struct mavl *t );
-void mavl_merge ( mavl_t target, mavl_t source );
-void mavlnode_destroy ( struct mavl *t, struct mavlnode *n );
-struct mavlnode *mavlnode_get ( struct mavl *t, void *data );
-struct mavlnode * mavl_get_node_cmp(struct mavl *t ,void *data,
-	int ( *cmp ) ( const void *, const void * ));
-
-
-#define mavl_get_first(tree,search) mavl_get_ext(tree,search,MAVL_FIND_FIRST)
-#define mavl_get_last(tree,search) mavl_get_ext(tree,search,MAVL_FIND_LAST)
-
-
-
-extern int mavl_foreach_lr ( struct mavlnode *n, int ( *callback ) ( void *, void * ),
-                             void *cbpriv );
-extern int mavl_foreach_rl ( struct mavlnode *n, int ( *callback ) ( void *, void * ),
-                             void *cbpriv );
-int mavl_foreach_from_lr ( struct mavl *t, struct mavlnode *n, void *data,
-                           int ( *callback ) ( void *, void * ), void *cbpriv );
-
-
-
-
-
-
-void *mavl_replace_data ( struct mavl *t, void *data, int len );
-
-
-
-/**
- * This macro is an alias for #mavl_get
- */
-#define mavl_find(t,d) mavl_get(t,d)
-
-#define mavl_find_ptr(tree,search_ptr) mavl_get_ptr(tree,search_ptr)
-#define mavl_insert(t,d) mavl_add(t,d)
-
-
-#define mavl_foreach_asc(t,cb,priv) mavl_foreach_lr((t)->root,cb,priv)
-#define mavl_foreach_desc(t,cb,priv) mavl_foreach_rl((t)->root,cb,priv)
-
-#define mavl_foreach_from_asc(t,d,cb,priv) mavl_foreach_from_lr(t,(t)->root,d,cb,priv);
-
-
-struct mavliter {
-	struct mavlnode *stack[MAVL_MAX_DEPTH * 2];
-	
-	struct mavlnode *cur;
-	int stack_ptr;
-	struct mavlnode * root;
-	int ( *cmp ) ( const void *, const void * );
-	
-};
-typedef struct mavliter mavliter_t;
-
-
-void * mavliter_next ( mavliter_t *i );
-
-void * mavliter_seek_set ( struct mavliter *i );
-
-void mavliter_init ( mavliter_t *i, mavl_t t );
-
-
-void * mavliter_get ( mavliter_t *i );
-
-void * mavliter_get_ptr(mavliter_t *i);
-
-void * mavliter_seek ( mavliter_t *i, void *d );
-
-/**
- * Define a AVL Iterator varialble and accociate it with
- * an AVL Tree.
- * @param i Name of the variable to define
- * @param t #mavl_t Tree to associate
- * @see #mavliter_get #mavliter_foreach
- *
- * Example:
- * \code
-   mavl_t datatree = mavl_create();
-
-   // fill up datatree with some values
-
-   MAVLITER_DEFINE (i,datatree);
-   mavliter_foreach(&i) {
-	// Get the current value
-	void * value = mavliter_get(&i);
-
-   }
-   \endcode
- */
-#define MAVLITER_DEFINE(iterator,mavl_obj)\
-	mavliter_t iterator; mavliter_init(&iterator,mavl_obj)
-
-
-/**
- * Iterate through all elements of an MAVL Object using a MAVL Iterator.
- * @param i pointer to MAVL Interator object
- */
-#define mavliter_foreach(iterator)\
-	for (mavliter_seek_set(iterator); NULL != mavliter_get(iterator); mavliter_next(iterator))
-
-#define mavliter_foreach_from(i,from)\
-	for (mavliter_seek(i,from); NULL != mavliter_get(i); mavliter_next(i))
-
-#define mavliter_foreach_asc(iter,val) \
-	while(NULL != (val = mavliter_next(iter)))
-
-
-
-/**
- * Get the number of elements stored in a mavl object
- * @param m mavl object
- * @return Number of elemenst
- */
-#define mavl_get_count(m) (m->count)
-
-/*
-#typedef mavl_t mavl_conststr_t;
-#extern mavl_conststr_t mavl_create_conststr();
-*/
-
-/*
-//int mavl_cmp_str ( const union mavldata *e1, const union mavldata *e2 );
-*/
-
-
-/*
-static inline void *mavl_replace_data(struct mavl *t, void *data, int len)
-{
-	void *df = mavl_get(t, data);
-	if (!df)
-		return NULL;
-	memcpy(df, data, len);
-	return df;
-}
-
-static inline void *mavl_replace(struct mavl *t,void *data){
-	struct mavlnode * node = mavl_get_node(t,data);
-	if (node){
-		t->del(node->data);
-		return node->data=data;
-	}
-	return mavl_add(t,data);
-}
-*/
-
-
-
-void mavl_freeptr(void *ptr);
-
-/**
- * Create a mavl_t object which stores pointers. 
- * @param cmp a pointer to the compare function
- * @param del a pointer to a delete function
- * @return The mavl_t object or NULL if an error has occured.
- */
-#define mavl_create_ptr(cmp,del)\
-	mavl_create(cmp,del,sizeof(void*))
-	
-	
-int mavl_cmpstr(const void *p1, const void *p2);
-#define mavl_create_str() mavl_create_ptr(mavl_cmpstr,mavl_freeptr)
-#define mavl_create_conststr() mavl_create_ptr(mavl_cmpstr,NULL)
-
-void * mavl_get_ptr ( mavl_t tree, void * search );
-void * mavl_add_ptr ( mavl_t tree, const void *ptr );
-
-#define mavl_add_str(tree,str) mavl_add_ptr(tree,str)
-#define mavl_get_str(tree,search) ((char *)(mavl_get_ptr(tree,search)))
-#define mavliter_get_str(iter) ((char*)(mavliter_get_ptr(iter)))
-#define mavliter_get_conststr(iter) ((const char*)(mavliter_get_ptr(iter)))
-
-/**
- * @} MAVL
- * 
- * @} ALGOS
- * 
- */
-
-
-
-
-#endif

src/cw/mavl_add.c

@@ -1,233 +0,0 @@
-/**
- * @file
- * @brief Implementation of mavl_add
- */
-
-#include "mavl.h"
-
-static struct mavlnode *mavlnode_create ( struct mavl *t, const void *data )
-{
-	struct mavlnode *n = malloc ( sizeof ( struct mavlnode ) + t->data_size );
-	
-	if ( !n )
-		return NULL;
-		
-	n->left = n->right = NULL;
-	n->bal = 0;
-	
-	/*n->data = *data;*/
-	memcpy ( mavlnode_dataptr ( n ), data, t->data_size );
-	
-	return n;
-}
-
-
-static int mavl_add0 ( struct mavl *t, struct mavlnode **parent, const void ** data )
-{
-	struct mavlnode *tmp;
-	struct mavlnode *n = *parent;
-	int rc = t->cmp ( *data, mavlnode_dataptr ( n ) );
-	
-	int bal;
-	
-	if ( rc == 0 ) {
-		/*		*data = &n->data;*/
-		
-		/*		memcpy(data,mavlnode_dataptr(n),t->data_size);*/
-		*data = mavlnode_dataptr ( n );
-		return 2;
-	}
-	
-	if ( rc < 0 ) {
-		if ( n->left ) {
-			bal = mavl_add0 ( t, &n->left, data );
-			
-			if ( bal > 1 )
-				return bal;
-				
-			n->bal -= bal;
-			
-			if ( n->bal == 0 )
-				return 0;
-				
-			if ( n->bal == -2 ) {
-				if ( n->left->bal == -1 ) {
-					n->bal = 0;
-					n->left->bal = 0;
-					*parent = n->left;
-					tmp = n->left->right;
-					n->left->right = n;
-					n->left = tmp;
-					return 0;
-				}
-				
-				if ( n->left->bal == 1 ) {
-					*parent = n->left->right;
-					
-					if ( ( *parent )->bal == 1 ) {
-						n->bal = 0;
-						n->left->bal = -1;
-						
-					} else if ( ( *parent )->bal == -1 ) {
-						n->bal = 1;
-						n->left->bal = 0;
-						
-					} else {
-						n->bal = 0;
-						n->left->bal = 0;
-					}
-					
-					( *parent )->bal = 0;
-					n->left->right = ( *parent )->left;
-					( *parent )->left = n->left;
-					tmp = ( *parent )->right;
-					( *parent )->right = n;
-					n->left = tmp;
-					return 0;
-					
-				}
-				
-			}
-			
-			return bal;
-			
-		}
-		
-		/* n->left is 0 */
-		n->left = mavlnode_create ( t, *data );
-		*data = mavlnode_dataptr(n->left);
-		
-		if ( !n->left )
-			return 3;
-			
-		t->count++;
-		
-		if ( n->right == 0 ) {
-			n->bal = -1;
-			return 1;
-		}
-		
-		n->bal = 0;
-		return 0;
-		
-	} else {
-		if ( n->right ) {
-			bal = mavl_add0 ( t, &n->right, data );
-			
-			if ( bal > 1 )
-				return bal;
-				
-			n->bal += bal;
-			
-			if ( n->bal == 0 )
-				return 0;
-				
-			if ( n->bal == 2 ) {
-				if ( n->right->bal == 1 ) {
-					n->bal = 0;
-					n->right->bal = 0;
-					*parent = n->right;
-					tmp = n->right->left;
-					n->right->left = n;
-					n->right = tmp;
-					return 0;
-					
-				} else if ( n->right->bal == -1 ) {
-					*parent = n->right->left;
-					
-					if ( ( *parent )->bal == -1 ) {
-						n->bal = 0;
-						n->right->bal = 1;
-						
-					} else if ( ( *parent )->bal == 1 ) {
-						n->bal = -1;
-						n->right->bal = 0;
-						
-					} else {
-						n->bal = 0;
-						n->right->bal = 0;
-					}
-					
-					( *parent )->bal = 0;
-					n->right->left = ( *parent )->right;
-					( *parent )->right = n->right;
-					tmp = ( *parent )->left;
-					( *parent )->left = n;
-					n->right = tmp;
-					return 0;
-				}
-			}
-			
-			return bal;
-		}
-		
-		/* n->right is 0 */
-		
-		n->right = mavlnode_create ( t, *data );
-		*data = mavlnode_dataptr(n->right);
-
-		
-		if ( !n->right )
-			return 3;
-			
-		t->count++;
-		
-		if ( n->left == 0 ) {
-			n->bal = 1;
-			return 1;
-		}
-		
-		n->bal = 0;
-		return 0;
-	}
-}
-
-
-/**
- * @brief mavl add function
- * Add an element to an AVL tree
- * @param t mavl
- * @param data pointer to the element to add
- * @param exists pointer to an interger vairable which wil be set to 1, if
- * the element to add already exists in the tree. If the element did't
- * exist, the variable ist to 0.
-
- * @return A pointer to the element in the tree. If the element was added, 
- * it the pointer to newly created element. If the element had already existed,
- * the pointer points to the existing element. mavl_add returns thero, if 
- * something else went wrong. Therefore consult errno.
- * 
- * 
- */
-void *mavl_add ( struct mavl *t, const void *data, int *exists )
-{
-	const void * d;
-	int rc;
-	
-	if ( t->root == NULL ) {
-		t->root = mavlnode_create ( t, data );
-		
-		if ( t->root )
-			t->count++;
-			
-		/* return &t->root->data; */
-		if (exists != NULL)
-			*exists=0;
-		return mavlnode_dataptr(t->root);
-	}
-	
-	d = data;
-	
-	rc = mavl_add0 ( t, &t->root, &d );
-	
-	if ( rc >= 3 )
-		return NULL;
-		
-	if ( exists != NULL){
-		if (rc==2) 
-			*exists=1;
-		else
-			*exists=0;
-	}
-	return (void*)d;
-}

src/cw/mavl_add_ptr.c

@@ -1,9 +0,0 @@
-#include "mavl.h"
-
-void *mavl_add_ptr(mavl_t tree, const void *ptr){
-	void * result;
-	result = mavl_add(tree,&ptr,NULL);
-	if (result)
-		return *(void**)result;
-	return NULL;
-}

src/cw/mavl_cmpstr.c

@@ -1,4 +1,5 @@
 #include "mavl.h"
+#include "mavltypes.h"
 
 int mavl_cmpstr (const void *s1, const void *s2)
 {

src/cw/mavl_create.c

@@ -1,50 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap 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.
-
-    libcapwap 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-/**
- *@file
- *@brief Implementation of mavl_create
- */
- 
-#include "mavl.h"
-
-/**
- * Create an AVL tree
- * @param cmp pointer to compare function
- * @param del pointer to delete function which is called when an element 
- * will be deletet
- * @param dta_size size of a data element
- * @return pointer to a #mavl struct. If the return value is NULL something
- * went wrong, and you should consult errno to get details.
- */
-struct mavl *mavl_create(int (*cmp) (const void *, const void  *),
-			       void (*del) (void *), size_t data_size)
-{
-	struct mavl *t = malloc(sizeof(struct mavl));
-	if (!t)
-		return NULL;
-	t->root = NULL;
-	t->count = 0;
-	t->cmp = cmp;
-	t->del = del;
-	t->data_size=data_size;
-	return t;
-}
-
-
-

src/cw/mavl_del.c

@@ -1,248 +0,0 @@
-#include "mavl.h"
-
-void mavlnode_destroy(struct mavl *t, struct mavlnode *n)
-{
-	if (t->del) {
-		t->del(mavlnode_dataptr(n));
-	}
-	free(n);
-	t->count--;
-}
-
-
-
-static void rot_rl(struct mavlnode *n, struct mavlnode **parent)
-{
-	struct mavlnode *tmp;
-	*parent = n->right->left;
-	n->right->left = (*parent)->right;
-	(*parent)->right = n->right;
-	tmp = (*parent)->left;
-	(*parent)->left = n;
-	n->right = tmp;
-}
-
-static void rot_lr(struct mavlnode *n, struct mavlnode **parent)
-{
-	struct mavlnode *tmp;
-	*parent = n->left->right;
-	n->left->right = (*parent)->left;
-	(*parent)->left = n->left;
-	tmp = (*parent)->right;
-	(*parent)->right = n;
-	n->left = tmp;
-}
-
-
-
-static void rot_l(struct mavlnode *n, struct mavlnode **parent)
-{
-	struct mavlnode *tmp;
-	*parent = n->right;
-	tmp = n->right->left;
-	n->right->left = n;
-	n->right = tmp;
-}
-
-
-static void rot_r(struct mavlnode *n, struct mavlnode **parent)
-{
-	struct mavlnode *tmp;
-	*parent = n->left;
-	tmp = n->left->right;
-	n->left->right = n;
-	n->left = tmp;
-}
-
-
-
-static int adj_bal_l(struct mavlnode *n, struct mavlnode **parent)
-{
-	if (n->right->bal == 1) {
-		n->bal = 0;
-		n->right->bal = 0;
-		rot_l(n, parent);
-		return 1;
-	} else if (n->right->bal == 0) {
-		n->bal = 1;
-		n->right->bal = -1;
-		rot_l(n, parent);
-		return 0;
-	} else if (n->right->bal == -1) {
-		n->bal = 0;
-		n->right->bal = 0;
-		n->right->left->bal = 0;
-		rot_rl(n, parent);
-		return 1;
-	}
-
-	return -11;		/* that should never happen */
-}
-
-static int adj_bal_r(struct mavlnode *n, struct mavlnode **parent)
-{
-
-	if (n->left->bal == -1) {
-		n->bal = 0;
-		n->left->bal = 0;
-		rot_r(n, parent);
-		return 1;
-	} else if (n->left->bal == 0) {
-		n->bal = -1;
-		n->left->bal = 1;
-		rot_r(n, parent);
-		return 0;
-	} else if (n->left->bal == 1) {
-		n->bal = 0;
-		n->left->bal = 0;
-		n->left->right->bal = 0;
-		rot_lr(n, parent);
-		return 1;
-	}
-	return -11;		/* that should never happen */
-}
-
-
-
-
-
-
-static int mavl_del_lo(mavl_t t, struct mavlnode **parent, void *data)
-{
-	struct mavlnode *n = *parent;
-
-	if (n->left != 0) {
-		int bal = mavl_del_lo(t, &n->left, data);
-		n->bal += bal;
-		if (n->bal == 1) {
-			return 0;
-		}
-		if (n->bal != 2)
-			return bal;
-		adj_bal_l(n, parent);
-		return 0;
-	}
-
-	/* found the lowest element */
-
-	*parent = n->right;
-/*	*data = n->data;*/
-	memcpy(data,mavlnode_dataptr(n),t->data_size);
-	
-	free(n);
-	return 1;
-
-
-	if (n->right) {
-		free(n);
-		return 1;
-	}
-	free(n);
-	return 1;
-
-}
-
-
-
-
-int mavl_del0(struct mavl *t, struct mavlnode **parent, void *data)
-{
-	struct mavlnode *n = *parent;
-	int rc;
-	int bal;
-	rc = t->cmp(data, mavlnode_dataptr(n));
-
-	if (rc == 0) {
-		if (n->right == 0 && n->left == 0) {
-			*parent = 0;
-			mavlnode_destroy(t, n);
-			return 1;
-		}
-
-		if (n->right && n->left == 0) {
-			*parent = n->right;
-			mavlnode_destroy(t, n);
-			return 1;
-
-		}
-
-		if (n->left && n->right == 0) {
-			mavlnode_destroy(t, n);
-			*parent = n->left;
-			return 1;
-
-		}
-
-		/* node has two childs */
-
-		if (t->del) {
-			t->del(mavlnode_dataptr(n));
-		}
-		t->count--;
-		bal = mavl_del_lo(t,&n->right, mavlnode_dataptr(n));
-		n->bal -= bal;
-		if (n->bal == -1)
-			return 0;
-
-		if (n->bal != -2)
-			return bal;
-
-		return adj_bal_r(n, parent);
-
-	}
-
-	if (rc < 0) {
-		if (n->left) {
-			bal = mavl_del0(t, &n->left, data);
-			if (bal == 2)
-				return 2;
-
-			n->bal += bal;
-			if (n->bal == 1)
-				return 0;
-
-			if (n->bal != 2)
-				return bal;
-
-			return adj_bal_l(n, parent);
-		}
-		return 2;	/* not found */
-	} else {		/* rc must be > 0 */
-		if (n->right) {
-			bal = mavl_del0(t, &n->right, data);
-			if (bal == 2)
-				return 2;
-
-			n->bal -= bal;
-			if (n->bal == -1)
-				return 0;
-
-			if (n->bal != -2)
-				return bal;
-
-			return adj_bal_r(n, parent);
-
-
-		}
-		return 2;	/* not found */
-
-	}
-
-}
-
-void *mavl_del(struct mavl *t, const void *data)
-{
-	void *d;
-	int rc;
-	
-	if (!t->root)
-		return NULL;
-
-	d = (void*)data;
-	rc = mavl_del0(t, &t->root, d);
-	if (rc == 2)
-		return NULL;
-	return (void*)data;
-}
-
-

src/cw/mavl_del_all.c

@@ -1,44 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap 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.
-
-    libcapwap 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-/**
- * @file
- * @brief Implements mavl_del_all 
- */
-
-#include "mavl.h"
-
-static void mavl_del_all0(struct mavl *t ,struct mavlnode * n)
-{
-	if (!n)
-		return;
-	mavl_del_all0(t,n->left);
-	mavl_del_all0(t,n->right);
-	mavlnode_destroy(t,n);
-}
-
-/**
- * Delete all elemets of a mavl object
- * @parm t mavl object 
- */
-void mavl_del_all(struct mavl *t)
-{
-	mavl_del_all0(t,t->root);
-	t->root=NULL;
-}
-

src/cw/mavl_destroy.c

@@ -1,9 +0,0 @@
-#include "mavl.h"
-
-void mavl_destroy(struct mavl *t)
-{
-	mavl_del_all(t);
-	free (t);
-}
-
-

src/cw/mavl_foreach.c

@@ -1,39 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap 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.
-
-    libcapwap 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "mavl.h"
-
-int mavl_foreach_rl(struct mavlnode *n, int (*callback)(void *,void *),void *cbpriv)
-{
-	if (!n)
-		return 1;
-	if (!mavl_foreach_rl(n->right,callback,cbpriv))
-		return 0;
-	if (!callback(cbpriv,mavlnode_dataptr(n)))
-		return 0;
-	return mavl_foreach_rl(n->left,callback,cbpriv);
-}
-
-void mavl_foreach(struct mavl *t, int (*callback)(void *,void *),void * cbpriv,int dir)
-{
-	if (dir)
-		mavl_foreach_lr(t->root,callback,cbpriv);
-	else
-		mavl_foreach_rl(t->root,callback,cbpriv);
-}
-

src/cw/mavl_foreach_lr.c

@@ -1,17 +0,0 @@
-#include "mavl.h"
-
-
-
-int mavl_foreach_lr(struct mavlnode *n, int (*callback)(void *,void *),void *cbpriv)
-{
-	if (!n)
-		return 1;
-	if (!mavl_foreach_lr(n->left,callback,cbpriv))
-		return 0;
-	if (!callback(cbpriv,mavlnode_dataptr(n)))
-		return 0;
-	return mavl_foreach_lr(n->right,callback,cbpriv);
-
-}
-
-

src/cw/mavl_freeptr.c

@@ -1,5 +0,0 @@
-#include "mavl.h"
-
-void mavl_freeptr(void *ptr){
-	free( *((void**)ptr) );
-}

src/cw/mavl_get.c

@@ -1,47 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap 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.
-
-    libcapwap 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file
- * @brief Implementation of mavl_get
- */ 
-
-
-#include "mavl.h"
-
-/**
- * Get an AVL tree element.
- * @param t pointer to mavl_t
- * @param data Element to get
- * @return pointer to element or NULL if not found. 
- */ 
-void * mavl_get(struct mavl *t ,const void *data)
-{
-	struct mavlnode *n = t->root;
-	while(n){
-		int rc=t->cmp(data,mavlnode_dataptr(n));
-		if (rc==0)
-			return mavlnode_dataptr(n);
-		if (rc<0)
-			n=n->left;
-		else
-			n=n->right;
-	}
-	return NULL;
-}
-
-

src/cw/mavl_get_ext.c

@@ -1,49 +0,0 @@
-#include "mavl.h"
-
-
-
-void * mavl_get_ext(struct mavl *t ,const void *search, int mode)
-{
-	
-	struct mavlnode *n,/**lastl,*/*last;
-	last = NULL; /*lastl=NULL;*/
-	n = t->root;
-	while(n){
-		int rc;
-		
-		rc = t->cmp(search,mavlnode_dataptr(n));
-		
-		/*printf("Compare: %s %s = %d\n",c1->key,c2->key, rc);*/
-		
-		if (rc==0){
-			return mavlnode_dataptr(n);
-			
-		}
-		
-		if (rc<0){
-			if (mode == MAVL_FIND_FIRST)
-				last = n;
-			if (n->left==NULL){
-				if (last == NULL)
-					return NULL;
-				return mavlnode_dataptr(last);
-				
-			}
-			n=n->left;
-		}
-		else{
-			if (mode == MAVL_FIND_LAST)
-				last=n;
-			
-			if(n->right==NULL){
-				if (last == NULL)
-					return NULL;
-				return mavlnode_dataptr(last);
-				
-			}
-			n=n->right;
-		}
-	}
-	return NULL;
-}
-

src/cw/mavl_get_node.c

@@ -1,36 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap 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.
-
-    libcapwap 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-
-#include "mavl.h"
-
-
-struct mavlnode * mavlnode_get(struct mavl *t ,void *data)
-{
-	struct mavlnode *n = t->root;
-	while(n){
-		int rc=t->cmp(data,mavlnode_dataptr(n));
-		if (rc==0)
-			return n;
-		if (rc<0)
-			n=n->left;
-		else
-			n=n->right;
-	}
-	return NULL;
-}

src/cw/mavl_get_node_cmp..c

@@ -1,18 +0,0 @@
-
-#include "mavl.h"
-
-struct mavlnode * mavl_get_node_cmp(struct mavl *t ,void *data,
-	int ( *cmp ) ( const void *, const void * ))
-{
-	struct mavlnode *n = t->root;
-	while(n){
-		int rc=cmp(data,mavlnode_dataptr(n));
-		if (rc==0)
-			return n;
-		if (rc<0)
-			n=n->left;
-		else
-			n=n->right;
-	}
-	return NULL;
-}

src/cw/mavl_get_ptr.c

@@ -1,10 +1,11 @@
 #include "mavl.h"
+#include "mavltypes.h"
 
 void * mavl_get_ptr(mavl_t tree, void * search)
 {
 	void * result;
 	
-	result = mavl_find(tree,&search);
+	result = mavl_get(tree,&search);
 	if (result)
 		return *(void**)result;
 	return NULL;

src/cw/mavl_merge.c

@@ -17,7 +17,7 @@
 */
 
 #include "mavl.h"
-
+#include "mavltypes.h"
 
 /** 
  * @file
@@ -36,8 +36,8 @@ static void mavlnode_move(mavl_t m,mavl_t t, struct mavlnode *n)
 		memcpy(mavlnode_dataptr(mn),mavlnode_dataptr(n),t->data_size);
 	}
 	else{
-		/*mavl_add(m,&n->data);*/
+		/*mavl_insert(m,&n->data);*/
-		mavl_add(m,mavlnode_dataptr(n),NULL);
+		mavl_insert(m,mavlnode_dataptr(n),NULL);
 
 	}
 	free(n);
@@ -50,8 +50,8 @@ static void mavl_merge0(mavl_t m, mavl_t t ,struct mavlnode * n)
 {
 	if (!n)
 		return;
-	mavl_merge0(m,t,n->left);
+	mavl_merge0(m,t,n->s[0]);
-	mavl_merge0(m,t,n->right);
+	mavl_merge0(m,t,n->s[1]);
 	mavlnode_move(m,t,n);
 }
 

src/cw/mavl_replace.c

@@ -3,7 +3,7 @@
 void *mavl_replace(struct mavl *t,const void  *data, int * replaced){
 	
 	int exists;
-	void * add = mavl_add(t,data,&exists);
+	void * add = mavl_insert(t,data,&exists);
 	
 	if (replaced != NULL){
 		*replaced = exists;
@@ -31,7 +31,7 @@ void *mavl_replace(struct mavl *t,const void  *data, int * replaced){
 //		return &node->data;
 		return mavlnode_dataptr(node);
 	}
-	return mavl_add(t,data);
+	return mavl_insert(t,data);
 */
 }
 

src/cw/mavl_replace_data.c

@@ -1,12 +0,0 @@
-#include "mavl.h"
-
-void *mavl_replace_data(struct mavl *t, void *data, int len)
-{
-	void *df = mavl_get(t, data);
-	if (!df)
-		return NULL;
-	memcpy(df, data, len);
-	return df;
-}
-
-

src/cw/mavliter_get.c

@@ -1,14 +0,0 @@
-#include "mavl.h"
-
-/**
- * Get the element, where AVL Iterator currently is positioned.
- * @param i AVL Iterator
- * @return element or NULL if not found.
- */
-void * mavliter_get(mavliter_t *i)
-{
-	if (!i->cur)
-		return NULL;
-		
-	return mavlnode_dataptr(i->cur);
-}

src/cw/mavliter_get_ptr.c

@@ -1,4 +1,5 @@
 #include "mavl.h"
+#include "mavltypes.h"
 
 /**
  * Get the element, where AVL Iterator currently is positioned.

src/cw/mavliter_init.c

@@ -1,18 +0,0 @@
-#include "mavl.h"
-
-/**
- * Init an AVL Tree Iterator.
- *
- * After initialization #mavliter_next would return the first element.
- * The behavior of #mavliter_get would still be undefined.
- * @param i AVL Iterator to initialize
- * @param t correspondending AVL Tree
- *
- * @See mavliter_t,
- */
-void mavliter_init ( mavliter_t *i, mavl_t t )
-{
-	i->root = t->root;
-	i->stack_ptr = 0;
-	i->cmp = t->cmp;
-}

src/cw/mavliter_next.c

@@ -1,68 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap 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.
-
-    libcapwap 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-/**
- *@file
- *@brief Implementation of mavliter_next
- */
-
-#include "mavl.h"
-
-/**
- * Get the next element within an AVL Tree.
- * @param i pointer to AVL Iterator
- * @return the element or NULL if there is no next elemeent.
- */
-
-void * mavliter_next ( mavliter_t *i )
-{
-	while ( i->stack_ptr ) {
-		i->stack_ptr--;
-		i->cur = i->stack[i->stack_ptr];
-		
-		if ( !i->cur )
-			continue;
-			
-		if ( ( i->stack_ptr ) & 1 ) {
-			/*return &i->cur->data;*/
-			return mavlnode_dataptr ( i->cur );
-		}
-		
-		break;
-	}
-	
-	if ( !i->cur ) {
-		return NULL;
-	}
-	
-	while ( i->cur->left ) {
-		/* push right branch */
-		i->stack[i->stack_ptr++] = i->cur->right;
-		
-		/* push node */
-		i->stack[i->stack_ptr++] = i->cur;
-		
-		i->cur = i->cur->left;
-	}
-	
-	i->stack[i->stack_ptr++] = i->cur->right;
-	
-	/*	return &i->cur->data;*/
-	return mavlnode_dataptr ( i->cur );
-	
-}

src/cw/mavliter_seek.c

@@ -1,69 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap 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.
-
-    libcapwap 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 Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-/**
- *@file
- *@brief Implementation of mavliter_seek
- */
-
-
-#include "mavl.h"
-
-
-/**
- * Set an AVL Iterator to a specific position.
- * @param i AVL Iterator
- * @param d element to search for
- * @return element found or NULL if not found
- */
-void * mavliter_seek(mavliter_t *i,void *d)
-{
-	int rc;
-	if (!i->root)
-		return NULL;
-
-	i->cur=i->root;
-	i->stack_ptr=0;
-		
-
-	while(i->cur) {
-
-/*		rc = i->cmp(d,&i->cur->data); */
-		rc = i->cmp(d,mavlnode_dataptr(i->cur));
-		if (rc==0){
-			i->stack[i->stack_ptr++]=i->cur->right;
-			i->stack[i->stack_ptr++]=i->cur;
-			return mavliter_next(i);
-		}
-
-		if (rc<0) {
-			i->stack[i->stack_ptr++]=i->cur->right;
-			i->stack[i->stack_ptr++]=i->cur;
-
-			i->cur=i->cur->left;
-
-		}
-		if (rc>0) {
-
-			i->cur=i->cur->right;
-		}
-	}
-	return NULL;
-}
-
-

src/cw/mavliter_seek_set.c

@@ -1,8 +0,0 @@
-#include "mavl.h"
-
-void * mavliter_seek_set ( struct mavliter *i )
-{
-	i->stack_ptr = 0;
-	i->cur = i->root;
-	return mavliter_next ( i );
-}

src/cw/mod.c

@@ -163,7 +163,7 @@ struct cw_MsgSet *cw_mod_get_msg_set(struct conn *conn,
 //	if (actions_registered_cb)
 //		actions_registered_cb(capwap_mod, bindings_mod, &(cached_set->actions));
 */
-	mavl_add_ptr(msgset_cache, cached_set);
+	mavl_insert_ptr(msgset_cache, cached_set);
 	return cached_set->msgset;
 }
 
@@ -228,7 +228,7 @@ struct cw_Mod *cw_mod_load(const char *mod_name, mavl_t global_cfg, int role)
 	memset(&search, 0, sizeof(search));
 	search.name = mod_name;
 
-	mod = mavl_find_ptr(mods_loaded, &search);
+	mod = mavl_get_ptr(mods_loaded, &search);
 	if (mod) {
 		cw_dbg(DBG_MOD, "MOD: Module already loaded '%s'", mod_name);
 		return mod;
@@ -267,7 +267,7 @@ struct cw_Mod *cw_mod_load(const char *mod_name, mavl_t global_cfg, int role)
 
 	mod->dll_handle = handle;
 
-	if (!mavl_add_ptr(mods_loaded, mod)) {
+	if (!mavl_insert_ptr(mods_loaded, mod)) {
 		dlclose(handle);
 		cw_log(LOG_ERR, "Can' add module %s", mod_name);
 		goto errX;

src/cw/msgset.c

@@ -8,6 +8,7 @@
 
 #include "msgset.h"
 #include "ktv.h"
+#include "mavltypes.h"
 
 static int cmp_cw_elemhandler_by_id(const void *elem1, const void *elem2)
 {
@@ -148,6 +149,9 @@ struct cw_MsgSet *cw_msgset_create()
 	}
 	
 	set->types_tree = cw_ktv_create_types_tree();
+	
+	printf("TYPES TREE %p\n",set->types_tree);
+
 	if (set->types_tree == NULL){
 		cw_msgset_destroy(set);
 		return NULL;
@@ -170,7 +174,7 @@ struct cw_ElemHandler *cw_msgset_get_elemhandler(struct cw_MsgSet *set,
 	search.proto = proto;
 	search.vendor = vendor;
 	search.id = id;
-	return mavl_find(set->handlers_by_id, &search);
+	return mavl_get(set->handlers_by_id, &search);
 }
 
 
@@ -197,7 +201,7 @@ static int update_msgdata(struct cw_MsgSet *set, struct cw_MsgData *msgdata,
 		}
 		
 /*		if (handler->type != NULL){
-			if (mavl_add_ptr( set->types_tree, handler->type ) == NULL){
+			if (mavl_insert_ptr( set->types_tree, handler->type ) == NULL){
 				cw_log(LOG_ERR, "Can't add type from handler: %s", strerror(errno));
 				continue;
 			}
@@ -290,7 +294,10 @@ int cw_msgset_add(struct cw_MsgSet *set,
 
 		/* add the message */
 		search.type = msgdef->type;
-		msg = mavl_add(set->msgdata, &search, &exists);
+
+		printf("Msg type name %s\n",msgdef->name);
+
+		msg = mavl_insert(set->msgdata, &search, &exists);
 		if (msg == NULL) {
 			cw_log(LOG_ERR, "Can't create messae");
 			return 0;
@@ -331,6 +338,10 @@ int cw_msgset_add(struct cw_MsgSet *set,
 	{
 		mavliter_t it;
 		cw_dbg(DBG_MOD,"  Known types:");
+
+		printf("TYPES TREE ITER %p\n",set->types_tree);
+
+
 		mavliter_init(&it,set->types_tree);
 		mavliter_foreach(&it){
 			struct cw_Type * t = mavliter_get_ptr(&it);
@@ -377,5 +388,5 @@ struct cw_MsgData *cw_msgset_get_msgdata(struct cw_MsgSet *set, int type)
 {
 	struct cw_MsgData search;
 	search.type = type;
-	return mavl_find(set->msgdata, &search);
+	return mavl_get(set->msgdata, &search);
 }

src/cw/send.c

@@ -1,3 +1,29 @@
+/*
+ * Copyright 2013,2020, The PLANIX Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #include <errno.h>
 
 
@@ -65,6 +91,76 @@ int conn_send_data_msg(struct conn * conn, uint8_t *rawmsg,int len)
 }
 
 
+#define MAX_MTU 1500
+int 
+cw_send_msg( struct conn * conn, uint8_t *msg)
+{
+	uint8_t buf[MAX_MTU];
+	int fragoffset,hlen,mtu;
+	int packetlen, msglen;
+
+	mtu = conn->mtu;
+
+	/* align mtu to 8 */
+	mtu &= ~3;
+
+	/* zero the first 8 bytes */
+	cw_set_dword(buf + 0, 0);
+	cw_set_dword(buf + 4, 0);
+
+	/* unencrypted */
+	cw_set_hdr_preamble(buf, CAPWAP_VERSION << 4 | 0);
+
+	/* set rmac, wireless binding id, and radio id */
+	cw_set_hdr_rmac(buf, conn->base_rmac);
+	cw_set_hdr_wbid(buf, conn->wbid);
+	cw_set_hdr_rid(buf, 0);
+
+
+	fragoffset = 0;
+
+	hlen = cw_get_hdr_hlen(buf)*4;
+
+	packetlen = hlen + cw_get_msg_elems_len(msg) + 8;
+
+	msglen = cw_get_msg_elems_len(msg) + 8;
+
+
+	while (msglen + hlen > mtu){
+		memcpy(buf+hlen,msg+(fragoffset*8),mtu-hlen);
+		msglen -= (mtu - hlen);
+
+		cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_F,1);
+		cw_set_dword(buf+4, conn->fragid<<16 | fragoffset<<3 );
+
+		cw_dbg_pkt(DBG_PKT_OUT,conn,buf,mtu,(struct sockaddr*)&conn->addr);
+		if (conn->write(conn,buf,mtu)<0)
+			return -1;
+
+		fragoffset+=(mtu-hlen)/8;
+		cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_M,0);
+		cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_W,0);
+		hlen = 8;
+		cw_set_hdr_hlen(buf,hlen/4);
+
+	}
+
+	if (fragoffset)
+		cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_F | CAPWAP_FLAG_HDR_L,1);
+	else
+		cw_set_hdr_flags(buf,CAPWAP_FLAG_HDR_F,0);
+
+	memcpy(buf+hlen,msg+(fragoffset*8),mtu-hlen);
+
+	cw_set_dword(buf+4, conn->fragid<<16 | fragoffset<<3 );
+
+
+	cw_dbg_pkt(DBG_PKT_OUT,conn,buf,packetlen,(struct sockaddr*)&conn->addr);
+
+	return conn->write(conn,buf,msglen + hlen);
+	
+}
+
 
 
 
@@ -81,12 +177,13 @@ int cw_send_request(struct conn *conn,int msg_id)
 		errno=ENOMSG;
 		return -1;
 	}
-	conn_send_msg(conn, conn->req_buffer);
+/*	conn_send_msg(conn, conn->req_buffer);*/
 
 	
 
 	rc=-1;
 	for (i=0; i<conn->max_retransmit && rc<0; i++){
+		conn_send_msg(conn, conn->req_buffer);
 		if ( i>0 ){
 			cw_log(LOG_WARNING,"Retransmitting request ... %d",i);
 		}

src/cw/strheap.c

@@ -20,7 +20,7 @@ cw_strheap_t cw_strheap_create()
 const char * cw_strheap_add(cw_strheap_t t, struct cw_StrListElem *s)
 {
 	mavl_del(t,s);
-	return mavl_add(t,s,NULL);
+	return mavl_insert(t,s,NULL);
 }
 
 int cw_strheap_register_strings(cw_strheap_t h, struct cw_StrListElem *s) 

src/lib.mk

@@ -0,0 +1,53 @@
+MF=Mf-$(KERNEL)-$(ARCH).mk
+
+LIBTARGET=$(OBJDIR)/$(PROG)
+
+V:=@
+
+$(SNAME): $(MF) $(SOURCES)
+	@mkdir -p $(OBJDIR)
+	@mkdir -p $(LIBARCHDIR)
+	@$(MAKE) -f $(MF) $(SNAME)
+
+$(DNAME): $(MF) $(SOURCES)
+	@mkdir -p $(OBJDIR)
+	@mkdir -p $(LIBARCHDIR)
+	@$(MAKE) -f $(MF) $(DNAME)
+
+$(MF): Makefile
+	@rm -f $(MF)
+	@echo "CFLAGS=$(CFLAGS)" >> $(MF)
+	@echo "LDFLAGS=$(LDFLAGS)" >> $(MF)
+	@echo -n "OBJS=" >> $(MF) 
+	@for f in $(SOURCES) ; do \
+		OF=$(OBJDIR)/`basename "$${f%.*}.o"` ; \
+		echo -n " $${OF}" >> $(MF) ;\
+	done
+	@echo "" >> $(MF)
+	@echo "$(SNAME) : \$$(OBJS)" >> $(MF)
+	@echo "	@echo Creating static library: $(SNAME)" >> $(MF) 
+	@echo "	$(V)\$$(AR) rcs $(SNAME) \$$(OBJS)" >> $(MF)
+	@echo "" >> $(MF)
+	@echo "$(DNAME) : \$$(OBJS)" >> $(MF)
+	@echo "	@echo Creating dynamic library: $(DNAME)" >> $(MF) 
+	@echo "	$(V)\$$(LD) \$$(LDFLAGS) -shared -o $(DNAME) \$$(OBJS) $(LIBS)" >> $(MF)
+	@echo "" >> $(MF)
+#	@echo "	\$$(CC) -o $(PROGTARGET) \$$(LDFLAGS) \$$(OBJS) $(LIBS)" >> $(MF) 			
+	@for f in $(SOURCES) ; do \
+		OF=$(OBJDIR)/`basename "$${f%.*}.o"` ; \
+		echo $${OF}: $$f  >> $(MF) ; \
+		echo "	@if [ \"\$$(V)\" = \"@\" ]; then echo \"Compiling: $${f}\" ; fi" >> $(MF) ; \
+		echo "	\$$(V)\$$(CC) -c \$$(CFLAGS) -o $${OF} $${f}" >> $(MF) ; \
+	done
+
+
+clean:
+	rm -rf $(OBJDIR)
+	rm -f $(SNAME)
+	rm -f $(DNAME)
+	rm -f $(MF)
+
+install: $(PROGTARGET)
+	mkdir -p $(INSTALL_BINDIR)
+	install $(PROGTARGET) $(INSTALL_BINDIR)/$(PROG)
+

src/mod/capwap/Makefile

@@ -1,32 +1,42 @@
 include ../../Defs.mak
 
 
-OBJS=\
+SOURCES=\
-	mod_capwap_ac.o \
+	mod_capwap_ac.c \
-	capwap_actions_ac.o \
+	capwap_actions_ac.c \
-	capwap_in_wtp_board_data.o \
+	capwap_in_wtp_board_data.c \
-	capwap_in_ac_descriptor.o \
+	capwap_in_ac_descriptor.c \
-	capwap_out_wtp_board_data.o \
+	capwap_out_wtp_board_data.c \
-	capwap_out_ac_descriptor.o \
+	capwap_out_ac_descriptor.c \
-	capwap_out_get_idle_timeout.o \
+	capwap_out_get_idle_timeout.c \
-	capwap_out_wtp_descriptor.o \
+	capwap_out_wtp_descriptor.c \
-	capwap_in_wtp_descriptor.o \
+	capwap_in_wtp_descriptor.c \
-	capwap_out_ac_ip_list.o \
+	capwap_out_ac_ip_list.c \
-	capwap_in_vendor_specific_payload.o \
+	capwap_in_vendor_specific_payload.c \
-	capwap_in_mtu_discovery_padding.o \
+	capwap_in_mtu_discovery_padding.c \
-	capwap_out_capwap_control_ip_address.o \
+	capwap_out_capwap_control_ip_address.c \
-	capwap_in_capwap_control_ip_address.o \
+	capwap_in_capwap_control_ip_address.c \
-	capwap_out_capwap_local_ip_address.o\
+	capwap_out_capwap_local_ip_address.c\
 
 
 LIBDIR		:= ../../../lib
-LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
+LIBARCHDIR      := $(LIBDIR)/$(KERNEL)/$(ARCH)
-OBJDIR		:= ../../../obj/mod_capwap/$(ARCH)
+OBJDIR          := ../../../obj/mod_capwap/$(KERNEL)/$(ARCH)
+
 SNAME		:= $(LIBARCHDIR)/libmod_capwap.a
 DNAME		:= $(LIBARCHDIR)/mod_capwap.so
-MODNAME		:= $(LIBDIR)/mod_capwap.so
+#SLIBS		:= -lcw
-SLIBS		:= -lcw
+
-
+
-include ../Mod.mak
+CFLAGS+=-fPIC
+CFLAGS+= -I ../../ -I../ -I../../include
+
+all: $(SNAME) $(DNAME) 
+static: $(SNAME)
+dynamic: $(DNAME)
+	
+
+include ../../lib.mk
+
 
 

src/mod/capwap/capwap_actions_ac.c

@@ -27,6 +27,7 @@
 
 #include "mod_capwap.h"
 
+#include "cw/mavltypes.h"
 
 static int postprocess_join_request(struct conn *conn);
 
@@ -616,6 +617,25 @@ static struct cw_MsgDef messages[] = {
 		discovery_response_elements
 	},
 
+
+	{
+		"Primary Discovery Request",
+		CAPWAP_MSG_PRIMARY_DISCOVERY_REQUEST,
+		CW_ROLE_AC,
+		discovery_request_states,
+		discovery_request_elements
+	},
+	
+	{
+		"Primary Discovery Response",
+		CAPWAP_MSG_PRIMARY_DISCOVERY_RESPONSE,
+		CW_ROLE_WTP,
+		discovery_response_states,
+		discovery_response_elements
+	},
+
+
+
 	{
 		"Join Request",
 		CAPWAP_MSG_JOIN_REQUEST,
@@ -817,10 +837,10 @@ struct cw_MsgSet * capwap_register_msg_set(struct cw_MsgSet * set, int mode){
 	
 	cw_msgset_add_states(set,statemachine_states);
 	
-	mavl_add_ptr(set->types_tree,CW_TYPE_BSTR16);
+	mavl_insert_ptr(set->types_tree,CW_TYPE_BSTR16);
-	mavl_add_ptr(set->types_tree,CW_TYPE_BYTE);
+	mavl_insert_ptr(set->types_tree,CW_TYPE_BYTE);
-	mavl_add_ptr(set->types_tree,CW_TYPE_DWORD);
+	mavl_insert_ptr(set->types_tree,CW_TYPE_DWORD);
-	mavl_add_ptr(set->types_tree,CW_TYPE_WORD);
+	mavl_insert_ptr(set->types_tree,CW_TYPE_WORD);
 
 	cw_dbg(DBG_INFO,"CAPWAP: Done register messages");
 	return set;

src/mod/capwap/capwap_in_wtp_board_data.c

@@ -66,7 +66,7 @@ static void readsubelems_wtp_board_data(mavl_t cfg, uint8_t * msgelem,
 						       CW_ITEM_WTP_BOARD_MODELNO,
 						       msgelem + i, sublen);
 						        */
-				key = "model_no";
+				key = "model-no";
 				break;
 			case CW_BOARDDATA_SERIALNO:
 /*				mbag_set_bstrn(itemstore,
@@ -74,20 +74,20 @@ static void readsubelems_wtp_board_data(mavl_t cfg, uint8_t * msgelem,
 						       msgelem + i, sublen);
 
 */				
-				key = "serial_no";
+				key = "serial-no";
 				break;
 			case CW_BOARDDATA_MACADDRESS:
 /*				mbag_set_bstrn(itemstore,
 						       CW_ITEM_WTP_BOARD_MACADDRESS,
 						       msgelem + i, sublen);
 */
-				key = "mac_address";
+				key = "mac-address";
 				break;
 			case CW_BOARDDATA_BOARDID:
 /*				mbag_set_bstrn(itemstore, CW_ITEM_WTP_BOARD_ID,
 						       msgelem + i, sublen);
 */
-				key = "board_id";
+				key = "board-id";
 				break;
 			case CW_BOARDDATA_REVISION:
 /*				mbag_set_bstrn(itemstore,
@@ -95,6 +95,7 @@ static void readsubelems_wtp_board_data(mavl_t cfg, uint8_t * msgelem,
 						       msgelem + i, sublen);
 */
 				key = "revision";
+				break;
 			default:
 				key = NULL;
 				break;

src/mod/capwap/capwap_out_ac_ip_list.c

@@ -5,7 +5,7 @@
 
 
 #include "cw/cw.h"
-#include "cw/mavl.h"
+#include "mavl.h"
 
 
 

src/mod/capwap/capwap_out_wtp_board_data.c

@@ -61,10 +61,10 @@ int capwap_out_wtp_board_data(struct cw_ElemHandler * eh,
 	d += val->type->put(val,d);
 	/*cw_ktv_add(cfg,vendor_key,CW_TYPE_DWORD,data,len);*/
 	
-	d+=write_boarddata_subelem(d,cfg,eh->key,CW_SKEY_MODELNO,CW_BOARDDATA_MODELNO);
+	d+=write_boarddata_subelem(d,cfg,eh->key,"model-no",CW_BOARDDATA_MODELNO);
-	d+=write_boarddata_subelem(d,cfg,eh->key,CW_SKEY_SERIALNO,CW_BOARDDATA_SERIALNO);
+	d+=write_boarddata_subelem(d,cfg,eh->key,"serial-no",CW_BOARDDATA_SERIALNO);
 	d+=write_boarddata_subelem(d,cfg,eh->key,"board-id",CW_BOARDDATA_BOARDID);
-	d+=write_boarddata_subelem(d,cfg,eh->key,"board-revision",CW_BOARDDATA_REVISION);
+	d+=write_boarddata_subelem(d,cfg,eh->key,"revision",CW_BOARDDATA_REVISION);
 	d+=write_boarddata_subelem(d,cfg,eh->key,"mac-address",CW_BOARDDATA_MACADDRESS);
 	
 

src/mod/capwap80211/Makefile

@@ -1,19 +1,25 @@
 include ../../Defs.mak
 
 
-OBJS=\
+SOURCES=\
-	mod_capwap80211.o \
+	mod_capwap80211.c \
-	capwap80211_messages.o \
+	capwap80211_messages.c \
 
 
 LIBDIR		:= ../../../lib
-LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
+LIBARCHDIR	:= $(LIBDIR)/$(KERNEL)/$(ARCH)
-OBJDIR		:= ../../../obj/mod_capwap80211/$(ARCH)
+OBJDIR		:= ../../../obj/mod_capwap80211/$(KERNEL)/$(ARCH)
 SNAME		:= $(LIBARCHDIR)/libmod_capwap80211.a
 DNAME		:= $(LIBARCHDIR)/mod_capwap80211.so
-MODNAME		:= $(LIBDIR)/mod_capwap80211.so
 SLIBS		:= -lcw
 
-include ../Mod.mak
+CFLAGS+=-fPIC
+CFLAGS+= -I ../../ -I../ -I../../include
+
+all: $(SNAME) $(DNAME) 
+static: $(SNAME)
+dynamic: $(DNAME)
+
+include ../../lib.mk
 
 

src/mod/cisco/Makefile

@@ -2,18 +2,18 @@ include ../../Defs.mak
 
 
 
-OBJS=\
+SOURCES=\
-	mod_cisco_ac.o \
+	mod_cisco_ac.c \
-	cisco_actions_ac.o \
+	cisco_actions_ac.c \
-	cisco_in_wtp_descriptor.o \
+	cisco_in_wtp_descriptor.c \
-	cisco_out_wtp_descriptor.o \
+	cisco_out_wtp_descriptor.c \
-	cisco_in_ac_descriptor.o\
+	cisco_in_ac_descriptor.c\
-	cisco_out_ac_descriptor.o\
+	cisco_out_ac_descriptor.c\
-	cisco_out_radio_generic.o\
+	cisco_out_radio_generic.c\
-	cisco_out_ap_timesync.o\
+	cisco_out_ap_timesync.c\
-	cisco_in_spam_vendor_specific.o\
+	cisco_in_spam_vendor_specific.c\
-	cisco_out_lw_path_mtu.o\
+	cisco_out_lw_path_mtu.c\
-	cisco_out_capwap_local_ip_address.o
+	cisco_out_capwap_local_ip_address.c
 
 
 #	cisco80211.o \
@@ -39,14 +39,18 @@ OBJS=\
 
 	
 LIBDIR		:= ../../../lib
-LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
+LIBARCHDIR	:= $(LIBDIR)/$(KERNEL)/$(ARCH)
-OBJDIR		:= ../../../obj/mod_cisco/$(ARCH)
+OBJDIR		:= ../../../obj/mod_cisco/$(KERNEL)/$(ARCH)
 SNAME		:= $(LIBARCHDIR)/libmod_cisco.a
 DNAME		:= $(LIBARCHDIR)/mod_cisco.so
-MODNAME		:= $(LIBDIR)/mod_cisco.so
+
-SLIBS		:= -lcw -lconfuse
+CFLAGS+=-fPIC
-
+CFLAGS+= -I ../../ -I../ -I../../include
-
+
-include ../Mod.mak
+all: $(SNAME) $(DNAME) 
+static: $(SNAME)
+dynamic: $(DNAME)
+
+include ../../lib.mk
 
 

src/mod/cisco/cisco_actions_ac.c

@@ -96,7 +96,14 @@ static cw_KTVStruct_t cisco_loghost_config[] = {
 	{NULL,NULL,0,0}
 };
 
-static cw_KTVStruct_t cisco_ap_led_state_config[] = {
+
+static cw_KTVStruct_t cisco_ap_led_state_config70[] = {
+	{CW_TYPE_BYTE,		"led-state",		1,	-1},
+	{NULL,NULL,0,0}
+};
+
+
+static cw_KTVStruct_t cisco_ap_led_state_config73[] = {
 	{CW_TYPE_BYTE,		"led-state",		1,	-1},
 	{CW_TYPE_BYTE,		"save-flag",		1,	-1},
 	{NULL,NULL,0,0}
@@ -308,6 +315,24 @@ static cw_KTVStruct_t cisco_ap_model[]={
 	{NULL,NULL,0,0}
 };
 
+
+static cw_KTVStruct_t cisco_wtp_radio_config70[]={
+	{CW_TYPE_BYTE,"cfg-type",1,-1},
+	{CW_TYPE_WORD,"occupancy-limit",2,-1},
+	{CW_TYPE_BYTE,"cfg-period",1,-1},
+	{CW_TYPE_WORD,"cfp-maximum-duration",2,-1},
+	{CW_TYPE_BSTR16,"bss-id",6,-1},
+	{CW_TYPE_WORD,"beacon-period",2,-1},
+	{CW_TYPE_STR,"country-str1",3,-1},
+	{CW_TYPE_STR,"country-str2",3,-1},
+/*	{CW_TYPE_BYTE,"gpr-period",1,-1},*/
+	{CW_TYPE_DWORD,"reg",4,-1},
+/*	{CW_TYPE_BYTE,"max-stations",1,-1},*/
+	{NULL,NULL,0,0}
+};
+
+
+
 static cw_KTVStruct_t cisco_wtp_radio_config73[]={
 	{CW_TYPE_BYTE,"cfg-type",1,-1},
 	{CW_TYPE_WORD,"occupancy-limit",2,-1},
@@ -453,6 +478,37 @@ static cw_KTVStruct_t cisco_add_wlan[]={
 };
 
 
+static cw_KTVStruct_t cisco_add_wlan70[]={
+	{CW_TYPE_BYTE,"radio-id",1,-1},
+	{CW_TYPE_WORD,"wlan-capability",2,-1},
+	{CW_TYPE_BYTE,"wlan-id",1,4},
+	{CW_TYPE_DWORD,"encryption-policy",4,5},
+
+	{CW_TYPE_BSTR16,"wep-key",13,9},
+	{CW_TYPE_BYTE,"wep-key-index",1,41},
+	{CW_TYPE_BOOL,"wep-encryption",1,42},
+
+	{CW_TYPE_BYTE,"qos",1,324},
+	{CW_TYPE_WORD,"scan-defer-time",1,330},
+	{CW_TYPE_BOOL,"broadcast-ssid",1,332},
+	{CW_TYPE_WORD,"session-timout",2,381},
+
+	{CW_TYPE_BYTE, "dtim-period",1,440},
+	{CW_TYPE_STR,"profile-name",30,441},
+	{CW_TYPE_STR, "ssid",-1,480},
+
+/*	{CW_TYPE_BYTE, "dtim-period",1,541},
+	{CW_TYPE_STR, "ssid-a",30,545},
+	{CW_TYPE_BYTE, "allow-aaa-override",1,578},
+	{CW_TYPE_BYTE, "max-stations",1,580},*/
+	
+	{NULL,NULL,0,0}
+};
+
+
+
+
+
 static int cisco_in_lw_del_wlan(struct cw_ElemHandler *eh, 
 		struct cw_ElemHandlerParams *params, 
 			uint8_t * data,	 int len)
@@ -604,7 +660,7 @@ static int cisco_data(struct cw_ElemHandler *eh,
 }
 */
 
-static struct cw_ElemHandler handlers73[] = {
+static struct cw_ElemHandler handlers70[] = {
 	
 	{ 
 		"AC Name -(zero-length allowed)",	/* name */
@@ -814,11 +870,11 @@ static struct cw_ElemHandler handlers73[] = {
 	}
 	,
 	{ 
-		"AP LED State Config",			/* name */
+		"AP LED State Config (v7.0)",			/* name */
 		CISCO_ELEM_AP_LED_STATE_CONFIG,		/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
-		2,2,					/* min/max length */
+		1,1,					/* min/max length */
-		cisco_ap_led_state_config,		/* type */
+		cisco_ap_led_state_config70,		/* type */
 		"cisco/ap-led-state-config",		/* Key */
 		cw_in_generic_struct,			/* get */
 		cw_out_generic_struct			/* put */
@@ -1001,13 +1057,13 @@ static struct cw_ElemHandler handlers73[] = {
 		cw_out_generic				/* put */
 	},
 
-	{ /* WTP Radio Configuration for AC/WPT with version 7.3 */
+	{ /* WTP Radio Configuration for AC/WPT with version 7.0 */
 	
-		"WTP Radio Configuration",		/* name */
+		"WTP Radio Configuration (v7.3)",		/* name */
 		CISCO_ELEM_WTP_RADIO_CONFIGURATION,	/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
-		27,27,					/* min/max length */
+		25,25,					/* min/max length */
-		cisco_wtp_radio_config73,		/* type */
+		cisco_wtp_radio_config70,		/* type */
 		"cisco/wtp-radio-config",		/* Key */
 		cw_in_radio_generic_struct,		/* get */
 		cw_out_radio_generic_struct		/* put */
@@ -1163,19 +1219,6 @@ static struct cw_ElemHandler handlers73[] = {
 	}
 	,
 
-	{ 
-		"AP Venue Settings",				/* name */
-		CISCO_ELEM_AP_VENUE_SETTINGS,			/* Element ID */
-		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
-		5,1024,					/* min/max length */
-		cisco_ap_venue_settings,				/* type */
-		"cisco/ap-venue-settings",			/* Key */
-		cw_in_generic_struct,			/* get */
-		cw_out_generic_struct			/* put */
-	}
-	,
-
-
 
 	{ 
 		"Rouge Detection",				/* name */
@@ -1194,7 +1237,7 @@ static struct cw_ElemHandler handlers73[] = {
 		CISCO_ELEM_ADD_WLAN,			/* Element ID */
 		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
 		7,1117,					/* min/max length */
-		cisco_add_wlan,				/* type */
+		cisco_add_wlan70,			/* type */
 		"radio/wlan",				/* Key */
 		cw_in_generic_struct,			/* get */
 		cw_out_generic_struct,			/* put */
@@ -1393,6 +1436,7 @@ static struct cw_ElemDef discovery_request_elements[] ={
 	{0,0,			CAPWAP_ELEM_WTP_BOARD_DATA,	0, 0},
 	{0,CW_VENDOR_ID_CISCO,	CISCO_ELEM_RAD_NAME,		1, 0},
 	{0,CW_VENDOR_ID_CISCO,	CW_CISCO_BOARD_DATA_OPTIONS,	0, 0},
+	{0,0,			CAPWAP80211_ELEM_WTP_RADIO_INFORMATION,	0, 0},
 	{0,0,0,00}
 	
 };
@@ -1408,20 +1452,19 @@ static struct cw_ElemDef discovery_response_elements[] ={
 
 /*static uint16_t join_request_states[] = {CAPWAP_STATE_JOIN,0};*/
 static struct cw_ElemDef join_request_elements[] ={
-	{0,CW_VENDOR_ID_CISCO,	CW_CISCO_BOARD_DATA_OPTIONS,	1, 0},
+	{0,0,			CAPWAP_ELEM_WTP_IPV4_IP_ADDRESS,1,0},
+	{0,0,			CAPWAP_ELEM_WTP_IPV6_IP_ADDRESS,1,0},
 	{0,CW_VENDOR_ID_CISCO,	CISCO_ELEM_AP_GROUP_NAME,	1, 0},
 	{0,CW_VENDOR_ID_CISCO,	CISCO_ELEM_MWAR_ADDR,		1, 0},
 	{0,CW_VENDOR_ID_CISCO,	CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE},
-	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PATH_MTU,	0, 0},
 
 	
-	{0,0,			CAPWAP_ELEM_WTP_IPV4_IP_ADDRESS,1,0},
+	{0,CW_VENDOR_ID_CISCO,	CW_CISCO_BOARD_DATA_OPTIONS,	1, 0},
-	{0,0,			CAPWAP_ELEM_WTP_IPV6_IP_ADDRESS,1,0},
-
 	{0,0,CAPWAP_ELEM_CAPWAP_LOCAL_IPV4_ADDRESS,		0, CW_DELETE},
 	{0,0,CAPWAP_ELEM_CAPWAP_LOCAL_IPV6_ADDRESS,		0, CW_DELETE},
 	{0,0,			CAPWAP_ELEM_ECN_SUPPORT,	0, CW_DELETE},
 
+	{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO,	CISCO_LWELEM_PATH_MTU,	0, 0},
 
 	{0,0,0,00}
 	
@@ -1619,7 +1662,7 @@ static struct cw_ElemDef wtp_echo_response_elements[] ={
 };
 
 
-static struct cw_MsgDef messages[] = {
+static struct cw_MsgDef messages70[] = {
 	{
 		NULL,				/* name */
 		CAPWAP_MSG_DISCOVERY_REQUEST,	/* type */
@@ -1637,6 +1680,26 @@ static struct cw_MsgDef messages[] = {
 		discovery_response_elements,
 		
 	},
+
+	{
+		NULL,				/* name */
+		CAPWAP_MSG_PRIMARY_DISCOVERY_REQUEST,	/* type */
+		CW_ROLE_AC,			/* role */
+		NULL,				/* states */
+		discovery_request_elements,	/* elements */
+		NULL,				/* preprocess fun */
+		postprocess_discovery		/* postprocess fun */
+	},
+	{
+		NULL,				/* name */
+		CAPWAP_MSG_PRIMARY_DISCOVERY_RESPONSE,	/* type */
+		CW_ROLE_WTP,
+		NULL,
+		discovery_response_elements,
+		
+	},
+
+
 	{
 		NULL,				/* name */
 		CAPWAP_MSG_JOIN_REQUEST,	/* type */
@@ -1729,6 +1792,49 @@ static struct cw_MsgDef messages[] = {
 
 };
 
+static struct cw_ElemHandler handlers73[] = {
+	{ 
+		"AP LED State Config (>= v7.3)",	/* name */
+		CISCO_ELEM_AP_LED_STATE_CONFIG,		/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		1,1,					/* min/max length */
+		cisco_ap_led_state_config73,		/* type */
+		"cisco/ap-led-state-config",		/* Key */
+		cw_in_generic_struct,			/* get */
+		cw_out_generic_struct			/* put */
+	},
+
+	{ /* WTP Radio Configuration for AC/WPT with version 7.3 */
+	
+		"WTP Radio Configuration (v7.3)",		/* name */
+		CISCO_ELEM_WTP_RADIO_CONFIGURATION,	/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		27,27,					/* min/max length */
+		cisco_wtp_radio_config73,		/* type */
+		"cisco/wtp-radio-config",		/* Key */
+		cw_in_radio_generic_struct,		/* get */
+		cw_out_radio_generic_struct		/* put */
+	}
+	,
+
+
+
+	{ 
+		"AP Venue Settings",				/* name */
+		CISCO_ELEM_AP_VENUE_SETTINGS,			/* Element ID */
+		CW_VENDOR_ID_CISCO,0,			/* Vendor / Proto */
+		5,1024,					/* min/max length */
+		cisco_ap_venue_settings,				/* type */
+		"cisco/ap-venue-settings",			/* Key */
+		cw_in_generic_struct,			/* get */
+		cw_out_generic_struct			/* put */
+	}
+	,
+	
+	{0,0,0,0,0,0,0,0}
+};
+
+
 
 static struct cw_ElemHandler handlers75[] = {
 	{ 
@@ -1759,6 +1865,10 @@ static struct cw_ElemHandler handlers75[] = {
 
 
 
+static struct cw_MsgDef messages73[] = {
+	{0,0,0,0}
+};
+
 
 
 static struct cw_MsgDef messages75[] = {
@@ -1792,7 +1902,7 @@ struct cw_MsgSet * cisco_register_msg_set(struct cw_MsgSet * set, int mode){
 		postprocess_join_request_parent = md->postprocess;
 	}
 	
-        cw_msgset_add(set,messages, handlers73);
+        cw_msgset_add(set,messages70, handlers70);
 	cw_msgset_add_states(set,statemachine_states);
         return set;
 }
@@ -1816,6 +1926,9 @@ static void set_ac_version(struct conn * conn)
 		if(wtpver->type->len(wtpver)==4){
 			uint32_t rv;
 			rv = cw_get_dword(wtpver->type->data(wtpver));
+			if (rv >= 0x07030000){
+				cw_msgset_add(conn->msgset,messages73, handlers73);
+			}
 			if (rv >= 0x07056600){
 				cw_msgset_add(conn->msgset,messages75, handlers75);
 			}
@@ -1875,4 +1988,4 @@ static int preprocess_join_request(struct conn *conn)
 		}
 	}
 	return 1;
-}
+}

src/prog.mk

@@ -0,0 +1,37 @@
+MF=stage.mk
+
+PROGTARGET=$(OBJDIR)/$(PROG)
+
+
+$(PROGTARGET): $(MF) $(SOURCES)
+	@mkdir -p $(OBJDIR)
+	@$(MAKE) -f $(MF)
+
+$(MF): Makefile
+	@rm -f $(MF)
+	@echo "CFLAGS=$(CFLAGS)" >> $(MF)
+	@echo "LDFLAGS=$(LDFLAGS)" >> $(MF)
+	@echo -n "OBJS=" >> $(MF) 
+	@for f in $(SOURCES) ; do \
+		OF=$(OBJDIR)/`basename "$${f%.*}.o"` ; \
+		echo -n " $${OF}" >> $(MF) ;\
+	done
+	@echo "" >> $(MF)
+	@echo "$(PROGTARGET): \$$(OBJS)" >> $(MF) 
+	@echo "	\$$(CC) -o $(PROGTARGET) \$$(LDFLAGS) \$$(OBJS) $(LIBS)" >> $(MF) 			
+	@for f in $(SOURCES) ; do \
+		OF=$(OBJDIR)/`basename "$${f%.*}.o"` ; \
+		echo $${OF}: $$f  >> $(MF) ; \
+		echo "	\$$(CC) -c \$$(CFLAGS) -o $${OF} $${f}" >> $(MF) ; \
+	done
+
+
+clean:
+	rm -rf $(OBJDIR)
+	rm -f $(PROGTARGET)
+	rm -f $(MF)
+
+install: $(PROGTARGET)
+	mkdir -p $(INSTALL_BINDIR)
+	install $(PROGTARGET) $(INSTALL_BINDIR)/$(PROG)
+

src/wtp/Makefile

@@ -1,75 +1,20 @@
-#include ../Defs.mak
+include ../Defs.mak
-#include ../Config.mak
-#include ../WtpConfig.mak
-#-include ../Config.local.mak
-#-include ../WtpConfig.local.mak
-#include ../Macros.mak
-
-
-INCL_DIRS=-I../
 
+PROG=wtp
+OBJDIR=./o
 LIBDIR		:= ../../lib
-LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
+LIBARCHDIR	:= $(LIBDIR)/$(KERNEL)/$(ARCH)
-OBJDIR		:= ../../obj/wtp/$(ARCH)
-EXENAME		:= ./wtp
 
-LIBS		:= -lcw -lnettle
+CFLAGS+=-I../ -DUSE_OPENSSL -I../contrib/openssl-1.1.1f/include/ -I/home/tube/v/rsrch/libmavl
-#STATICLIBS	:= $(LIBDIR)/$(ARCH)/libcw.a
+LDFLAGS+=-L$(LIBARCHDIR) 
-LDFLAGS		+= -L$(LIBARCHDIR)
+LIBS+=-lcw -lnettle -lssl -lcrypto -ldl -lpthread -lmavl
 
-#ifeq ($(SSL_LIBRARY),GNUTLS)
+SOURCES=\
-#CFLAGS+=-DWITH_GNUTLS
+     	wtp_main.c\
-#CFLAGS+=$(GNUTLS_CFLAGS)
+	discovery.c\
-#LIBS+=$(GNUTLS_LIBS)
+	join.c\
-#LDFLAGS+=$(GNUTLS_LDFLAGS)
+	configure.c\
-#endif
+	run.c\
+	changestate.c
 
-#ifeq ($(SSL_LIBRARY),OPENSSL)
+include ../prog.mk
-CFLAGS+=-DWITH_OPENSSL
-CFLAGS+=$(OPESSL_CFLAGS)
-LDFLAGS+=$(OPENSSL_LDFLAGS)
-LIBS+=$(OPENSSL_LIBS)
-#endif
-
-#SRC=$(wildcard *.c)
-OBJS=\
-     	wtp_main.o\
-	discovery.o\
-	join.o\
-	configure.o\
-	run.o\
-	changestate.o\
-
-
-
-
-#OBJS=$(patsubst %.c,%.o,$(SRC))
-#OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS))
-
-ALL=$(EXENAME)
-
-all: $(ALL)
-
-#$(OBJDIR)/%.o:%.c
-
-.c.o:
-#	@mkdir -p $(OBJDIR)
-	@echo "  $(CC) "$<
-	@$(CC) $(INCL_DIRS) -c $(CFLAGS) $< -o $@
-
-$(EXENAME): $(OBJS)
-	echo "  $(LD) $(EXENAME)"
-	$(LD) $(LDFLAGS) -o $(EXENAME) $(OBJS) $(LIBS) $(STATICLIBS)
-
-
-clean: 
-	rm -f *.o
-#	rm  $(OBJDIR)/*
-	rm -f $(EXENAME)
-
-deps:  
-	echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > .depend
-	makedepend $(SRC) -f.depend -p$(OBJDIR)/
-
-
--include .depend

src/wtp/cisco.ktv

@@ -1,4 +1,4 @@
-ac-descriptor/active-wtps :Word: 2
+ac-descriptor/active-wtps :Word: 1
 ac-descriptor/dtls-policy :Byte: 0
 ac-descriptor/hardware/vendor :Dword: 4232704
 ac-descriptor/hardware/version :Bstr16: .x01000001
@@ -22,7 +22,7 @@ capwap-control-ip-address/address.2 :IPAddress: 192.168.0.162
 capwap-control-ip-address/wtps.0 :Word: 0
 capwap-control-ip-address/wtps.1 :Word: 10
 capwap-control-ip-address/wtps.2 :Word: 0
-capwap-local-ip-address :IPAddress: 192.168.0.14
+capwap-local-ip-address :IPAddress: 192.168.0.29
 capwap-timers/echo-interval :Byte: 30
 capwap-timers/max-discovery-interval :Byte: 10
 capwap-timers/min-discovery-interval :Byte: 0
@@ -36,14 +36,14 @@ cisco/ap-core-dump/compression :Bool: false
 cisco/ap-core-dump/enable :Bool: false
 cisco/ap-core-dump/filename :Str: 
 cisco/ap-core-dump/tftp-server :IPAddress: 0.0.0.0
-cisco/ap-failover-priority :Byte: 3
+cisco/ap-failover-priority :Byte: 1
 cisco/ap-group-name :Bstr16: default-group
 cisco/ap-led-state-config/led-state :Byte: 1
 cisco/ap-led-state-config/save-flag :Byte: 1
 cisco/ap-log-facility :Byte: 0
 cisco/ap-mode-and-type/mode :Byte: 0
 cisco/ap-mode-and-type/type :Byte: 0
-cisco/ap-model/model :Str: AIR-LAP1142N-E-K9
+cisco/ap-model/model :Str: AIR-LAP1131AG-E-K9
 cisco/ap-power-injector-config/selection :Byte: 0
 cisco/ap-power-injector-config/sitch-mac-address :Bstr16: .x000000000000
 cisco/ap-power-injector-config/state :Byte: 17
@@ -53,10 +53,17 @@ cisco/ap-regulatory-domain.0/code0 :Byte: 0
 cisco/ap-regulatory-domain.0/code1 :Byte: 1
 cisco/ap-regulatory-domain.0/set :Bool: true
 cisco/ap-regulatory-domain.0/slot :Byte: 0
+
+cisco/ap-regulatory-domain.1/band-id :Byte: 0
+cisco/ap-regulatory-domain.1/code0 :Byte: 0
+cisco/ap-regulatory-domain.1/code1 :Byte: 1
+cisco/ap-regulatory-domain.1/set :Bool: true
+cisco/ap-regulatory-domain.1/slot :Byte: 0
+
 cisco/ap-sub-mode :Byte: 0
 cisco/ap-telnet-ssh/ssh :Bool: false
 cisco/ap-telnet-ssh/telnet :Bool: false
-cisco/ap-timesync/timestamp :Dword: 1583784035
+cisco/ap-timesync/timestamp :Dword: 1585926286
 cisco/ap-timesync/type :Byte: 1
 cisco/ap-username-and-password/802.1x-credentials/option :Word: 2
 cisco/ap-username-and-password/802.1x-credentials/password :Str: 
@@ -79,11 +86,9 @@ cisco/loghost-config/loghost.0 :IPAddress: 7.7.1.3
 cisco/loghost-config/loghost.1 :IPAddress: 0.0.0.0
 cisco/loghost-config/loghost.2 :IPAddress: 0.0.0.0
 cisco/loghost-config/loghost.3 :IPAddress: 0.0.0.0
-cisco/lw_path_mtu/len :Word: 1095
-cisco/lw_path_mtu/max :Word: 1485
 cisco/mcast-mgid-info :Bstr16: .x002100010000000000000000000000000000000101000000
-cisco/mwar-addr/address :IPAddress: 192.168.0.180
+cisco/mwar-addr/address :IPAddress: 192.168.0.162
-cisco/mwar-addr/mwar-type :Byte: 1
+cisco/mwar-addr/mwar-type :Byte: 0
 cisco/mwar-addr/unknown :Word: 0
 cisco/mwar-hash-value :Bstr16: c4084177cd95ddbba1237bfcb3de6780fdf48214
 cisco/mwar-type :Byte: 0
@@ -94,9 +99,10 @@ cisco/rouge-and-mss/tcp-adjust-mss :Word: 0
 cisco/rouge-detection/rest :Bstr16: .x000aff800000
 cisco/rouge-detection/rouge-detection :Bool: false
 cisco/sig-toogle :Bool: true
-cisco/ssl-certfile :Str: ../../ssl/certs/wtp.crt
+cisco/ssl-certfile :Str: ../../ssl/certs/wtpc.crt
-cisco/ssl-cipher :Str: ALL
+#cisco/ssl-cipher :Str: ALL 
-cisco/ssl-keyfile :Str: ../../ssl/certs/wtp.key
+cisco/ssl-cipher :Str: RSA:AES-128-CBC:SHA1
+cisco/ssl-keyfile :Str: ../../ssl/certs/wtpc.key
 cisco/vlan/id :Word: 0
 cisco/vlan/tagging :Bool: false
 cisco/wtp-board-data/card-id :Word: 0
@@ -105,7 +111,7 @@ cisco/wtp-board-data/ethernet-mac-address :Bstr16: .x0800276edf58
 cisco/wtp-board-data/failover-priority :Bstr16: .x01010003
 cisco/wtp-board-data/options/ant-type :Byte: 1
 cisco/wtp-board-data/options/ap-type :Byte: 0
-cisco/wtp-board-data/options/failover-priority :Byte: 3
+cisco/wtp-board-data/options/failover-priority :Byte: 1
 cisco/wtp-board-data/options/flex-connect :Byte: 1
 cisco/wtp-board-data/wtp-model-hi :Dword: 0
 cisco/wtp-board-data/wtp-model-lo :Dword: 0
@@ -142,17 +148,17 @@ radio.0/cisco/rad-extended-config/multicast-data-range :Word: 0
 radio.0/cisco/rad-extended-config/rx-sensop-threshold :Word: 0
 radio.0/cisco/tx-power/current-tx-power :Word: 10
 radio.0/cisco/tx-power/reserved :Byte: 1
-radio.0/cisco/wtp-radio-config/beacon-period :Word: 100
+radio.0/cisco/wtp-radio-config/beacon-period :Word: 0
-radio.0/cisco/wtp-radio-config/bss-id :Bstr16: 123456
+radio.0/cisco/wtp-radio-config/bss-id :Bstr16: .x0800276edf58
-radio.0/cisco/wtp-radio-config/cfg-period :Byte: 4
+radio.0/cisco/wtp-radio-config/cfg-period :Byte: 0
 radio.0/cisco/wtp-radio-config/cfg-type :Byte: 1
-radio.0/cisco/wtp-radio-config/cfp-maximum-duration :Word: 60
+radio.0/cisco/wtp-radio-config/cfp-maximum-duration :Word: 0
 radio.0/cisco/wtp-radio-config/country-str1 :Str: DE
 radio.0/cisco/wtp-radio-config/country-str2 :Str: DE
 radio.0/cisco/wtp-radio-config/gpr-period :Byte: 10
 radio.0/cisco/wtp-radio-config/max-stations :Byte: 200
-radio.0/cisco/wtp-radio-config/occupancy-limit :Word: 100
+radio.0/cisco/wtp-radio-config/occupancy-limit :Word: 0
-radio.0/cisco/wtp-radio-config/reg :Dword: 65536
+radio.0/cisco/wtp-radio-config/reg :Dword: 256
 radio.0/cisco/wtp-radio-config/unknown75 :Byte: 0
 radio.0/decryption-error-report-period :Word: 120
 radio.0/operational-state/cause :Byte: Normal
@@ -196,15 +202,15 @@ radio.1/cisco/tx-power/current-tx-power :Word: 10
 radio.1/cisco/tx-power/reserved :Byte: 1
 radio.1/cisco/wtp-radio-config/beacon-period :Word: 100
 radio.1/cisco/wtp-radio-config/bss-id :Bstr16: .x04fe7f499b90
-radio.1/cisco/wtp-radio-config/cfg-period :Byte: 4
+radio.1/cisco/wtp-radio-config/cfg-period :Byte: 0
 radio.1/cisco/wtp-radio-config/cfg-type :Byte: 1
-radio.1/cisco/wtp-radio-config/cfp-maximum-duration :Word: 60
+radio.1/cisco/wtp-radio-config/cfp-maximum-duration :Word: 0
 radio.1/cisco/wtp-radio-config/country-str1 :Str: DE
 radio.1/cisco/wtp-radio-config/country-str2 :Str: DE
 radio.1/cisco/wtp-radio-config/gpr-period :Byte: 10
 radio.1/cisco/wtp-radio-config/max-stations :Byte: 200
-radio.1/cisco/wtp-radio-config/occupancy-limit :Word: 100
+radio.1/cisco/wtp-radio-config/occupancy-limit :Word: 0
-radio.1/cisco/wtp-radio-config/reg :Dword: 65536
+radio.1/cisco/wtp-radio-config/reg :Dword: 256
 radio.1/cisco/wtp-radio-config/unknown75 :Byte: 1
 radio.1/decryption-error-report-period :Word: 120
 radio.1/operational-state/cause :Byte: Normal
@@ -214,18 +220,18 @@ radio.1/wlan.0/add-lw-wlan/misc :Bstr16: .x3e9904fac0000100
 radio.1/wlan.0/add-lw-wlan/misc2 :Word: 4
 radio.1/wlan.0/add-lw-wlan/ssid :Str: TubeSSID
 radio.1/wtp-radio-information :Dword: 2
-radio.2/cisco/rad-extended-config/beacon-interval :Word: 48128
+#radio.2/cisco/rad-extended-config/beacon-interval :Word: 48128
-radio.2/cisco/rad-extended-config/beacon-range :Word: 0
+#radio.2/cisco/rad-extended-config/beacon-range :Word: 0
-radio.2/cisco/rad-extended-config/c-ccat :Word: 1
+#radio.2/cisco/rad-extended-config/c-ccat :Word: 1
-radio.2/cisco/rad-extended-config/multicast-buffer :Word: 0
+#radio.2/cisco/rad-extended-config/multicast-buffer :Word: 0
-radio.2/cisco/rad-extended-config/multicast-data-range :Word: 0
+#radio.2/cisco/rad-extended-config/multicast-data-range :Word: 0
-radio.2/cisco/rad-extended-config/rx-sensop-threshold :Word: 0
+#radio.2/cisco/rad-extended-config/rx-sensop-threshold :Word: 0
-radio.3/cisco/rad-extended-config/beacon-interval :Word: 59392
+#radio.3/cisco/rad-extended-config/beacon-interval :Word: 59392
-radio.3/cisco/rad-extended-config/beacon-range :Word: 0
+#radio.3/cisco/rad-extended-config/beacon-range :Word: 0
-radio.3/cisco/rad-extended-config/c-ccat :Word: 1
+#radio.3/cisco/rad-extended-config/c-ccat :Word: 1
-radio.3/cisco/rad-extended-config/multicast-buffer :Word: 0
+#radio.3/cisco/rad-extended-config/multicast-buffer :Word: 0
-radio.3/cisco/rad-extended-config/multicast-data-range :Word: 0
+#radio.3/cisco/rad-extended-config/multicast-data-range :Word: 0
-radio.3/cisco/rad-extended-config/rx-sensop-threshold :Word: 0
+#radio.3/cisco/rad-extended-config/rx-sensop-threshold :Word: 0
 radio.255/admin-state :Byte: reserved
 radio.255/operational-state/cause :Byte: Normal
 radio.255/operational-state/state :Byte: 0
@@ -234,6 +240,14 @@ radio/0/cisco/regulatory-domain/code1 :Byte: 1
 radio/0/cisco/regulatory-domain/set :Bool: true
 radio/0/cisco/regulatory-domain/slot :Byte: 0
 radio/0/wtp-radio-information :Dword: 1
+radio/1/cisco/regulatory-domain/code0 :Byte: 0
+radio/1/cisco/regulatory-domain/code1 :Byte: 1
+radio/1/cisco/regulatory-domain/set :Bool: true
+radio/1/cisco/regulatory-domain/slot :Byte: 0
+radio/1/wtp-radio-information :Dword: 1
+
+
+
 radio/wlan/encryption-policy :Dword: 16777216
 radio/wlan/radio-od :Byte: 1
 radio/wlan/wlan-capability :Word: 17
@@ -247,11 +261,12 @@ tube.1/main :Byte: 12
 tube.1/zumsel :Byte: 12
 wtp-board-data/board-id :Bstr16: .x0000
 wtp-board-data/mac-address :Bstr16: .x0800276edf58
-wtp-board-data/model-no :Bstr16: AIR-LAP1142N-E-K9
+wtp-board-data/model-no :Bstr16: AIR-LAP1131AG-E-K9  
-wtp-board-data/serial-no :Bstr16: FCZ1406W232
+wtp-board-data/revision :Bstr16: B0
+wtp-board-data/serial-no :Bstr16: FCZ1441Q0XZ
 wtp-board-data/vendor :Dword: 4232704
 wtp-descriptor/bootloader/vendor :Dword: 4232704
-wtp-descriptor/bootloader/version :Bstr16: .x0c041200
+wtp-descriptor/bootloader/version :Bstr16: .x0c030800
 wtp-descriptor/hardware/vendor :Dword: 4232704
 wtp-descriptor/hardware/version :Bstr16: .x01000000
 wtp-descriptor/max-radios :Byte: 2

src/wtp/join.c

@@ -12,8 +12,7 @@
 #include "cw/log.h"
 #include "cw/dbg.h"
 #include "cw/sock.h"
-#include "cw/dtls.h"
+#include "mavl.h"
-#include "cw/mavl.h"
 
 #include "wtp.h"
 

src/wtp/wtp_main.c

@@ -13,6 +13,7 @@
 
 #include "cw/dtls.h"
 #include "wtp.h"
+#include "cw/mavltypes.h"
 
 #define MAX_MODS 32
 struct bootcfg{
@@ -127,7 +128,7 @@ int main (int argc, char **argv)
 	/* create a types tree with default types */
 	types_tree = cw_ktv_create_types_tree();
 	for (ti=CW_KTV_STD_TYPES;*ti;ti++){
-		mavl_add_ptr(types_tree,*ti);
+		mavl_insert_ptr(types_tree,*ti);
 	}
 
 	/* read the initial config file */
@@ -194,7 +195,7 @@ exit(0);
 	cw_discovery_init_results(&dis);
 /*cw_run_discovery(conn, "255.255.255.255","192.168.56.1", &dis);*/
 /*	cw_run_discovery(conn, "255.255.255.255",NULL, &dis);*/
-	cw_run_discovery(conn, "192.168.0.162","192.168.0.29", &dis);
+	cw_run_discovery(conn, "192.168.0.162","192.168.0.14", &dis);
 
 	cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ===");
 

ssl/mkcert.sh

@@ -64,6 +64,9 @@ then
 	createcert $SUBJ
 fi
 
+
+CISCOTIME='2013-12-24 08:15:42'
+
 if [ "$TYPE" = "cisco-ac" ] 
 then
 	SUBJ="/C=US/ST=California/L=San Jose/O=Cisco Virtual Wireless LAN Controller/CN=DEVICE-AC-TUBE/emailAddress=7u83@mail.ru"
@@ -84,13 +87,11 @@ then
                 -keyout certs/${NAME}.key -out certs/${NAME}.crt \
                 -config openssl.cnf \
                 -x509 \
-                -subj "$SUBJ"
+                -subj "$SUBJ" 
 
-	$OPENSSL x509 -in $DIR/$NAME.crt -out $DIR/$NAME.pem
+	$OPENSSL x509 -in $DIR/$NAME.crt -out $DIR/$NAME.pem -days=128
 
 
-#	createcert "$SUBJ"
-
 
 fi
 

ssl/mkcerts.sh

@@ -4,3 +4,5 @@
 ./mkcert.sh ac-cisco cisco-ac
 
 ./mkcert.sh wtp
+./mkcert.sh wtpc cisco-ap
+

wtp.project

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CodeLite_Project Name="wtp" InternalType="">
-  <VirtualDirectory Name="src">
-    <VirtualDirectory Name="wtp">
-      <File Name="src/wtp/dot11.c"/>
-      <File Name="src/wtp/nlt.h"/>
-      <File Name="src/wtp/setup_conf.c"/>
-      <File Name="src/wtp/wtp.h"/>
-      <File Name="src/wtp/image_update.c"/>
-      <File Name="src/wtp/wtp_interface.c"/>
-      <File Name="src/wtp/wtp_conf.c"/>
-      <File Name="src/wtp/wtp_main.c"/>
-      <File Name="src/wtp/cfg.c"/>
-      <File Name="src/wtp/conf_uci.c"/>
-      <File Name="src/wtp/dot11.h"/>
-      <File Name="src/wtp/cfg.h"/>
-      <File Name="src/wtp/nlt_cmdnames.c"/>
-      <File Name="src/wtp/configure.c"/>
-      <File Name="src/wtp/nlt_attrnames.c"/>
-      <File Name="src/wtp/run.c"/>
-      <File Name="src/wtp/wtpdrv.c"/>
-      <File Name="src/wtp/nlt.c"/>
-      <File Name="src/wtp/wtp_conf.h"/>
-      <File Name="src/wtp/wtp_interface.h"/>
-      <File Name="src/wtp/changestate.c"/>
-      <File Name="src/wtp/nl80211.h"/>
-      <File Name="src/wtp/join.c"/>
-      <File Name="src/wtp/sulking.c"/>
-      <File Name="src/wtp/wtpdrv.h"/>
-      <File Name="src/wtp/discovery.c"/>
-    </VirtualDirectory>
-  </VirtualDirectory>
-  <Description/>
-  <Dependencies/>
-  <Dependencies Name="Debug"/>
-  <Dependencies Name="Release"/>
-  <Settings Type="Dynamic Library">
-    <GlobalSettings>
-      <Compiler Options="" C_Options="" Assembler="">
-        <IncludePath Value="."/>
-      </Compiler>
-      <Linker Options="">
-        <LibraryPath Value="."/>
-      </Linker>
-      <ResourceCompiler Options=""/>
-    </GlobalSettings>
-    <Configuration Name="Debug" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-g" C_Options="-g" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
-        <IncludePath Value="."/>
-      </Compiler>
-      <Linker Options="" Required="yes"/>
-      <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Debug" Command="$(WorkspacePath)/src/wtp/wtp" CommandArguments="-dall -mcisco -ccisco.ktv" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(WorkspacePath)/src/wtp/" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
-      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
-        <![CDATA[LD_LIBRARY_PATH=../../lib]]>
-      </Environment>
-      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
-        <DebuggerSearchPaths/>
-        <PostConnectCommands/>
-        <StartupCommands/>
-      </Debugger>
-      <PreBuild/>
-      <PostBuild/>
-      <CustomBuild Enabled="yes">
-        <RebuildCommand>make clean &amp;&amp; make</RebuildCommand>
-        <CleanCommand>make clean</CleanCommand>
-        <BuildCommand>make</BuildCommand>
-        <PreprocessFileCommand/>
-        <SingleFileCommand/>
-        <MakefileGenerationCommand/>
-        <ThirdPartyToolName>None</ThirdPartyToolName>
-        <WorkingDirectory>$(WorkspacePath)/src/wtp</WorkingDirectory>
-      </CustomBuild>
-      <AdditionalRules>
-        <CustomPostBuild/>
-        <CustomPreBuild/>
-      </AdditionalRules>
-      <Completion EnableCpp11="no" EnableCpp14="no">
-        <ClangCmpFlagsC/>
-        <ClangCmpFlags/>
-        <ClangPP/>
-        <SearchPaths/>
-      </Completion>
-    </Configuration>
-    <Configuration Name="Release" CompilerType="clang( tags/RELEASE_380/final )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
-        <IncludePath Value="."/>
-      </Compiler>
-      <Linker Options="-O2" Required="yes"/>
-      <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="" IntermediateDirectory="./Release" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
-      <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
-        <![CDATA[]]>
-      </Environment>
-      <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no">
-        <DebuggerSearchPaths/>
-        <PostConnectCommands/>
-        <StartupCommands/>
-      </Debugger>
-      <PreBuild/>
-      <PostBuild/>
-      <CustomBuild Enabled="yes">
-        <RebuildCommand/>
-        <CleanCommand>make clean</CleanCommand>
-        <BuildCommand>make</BuildCommand>
-        <PreprocessFileCommand/>
-        <SingleFileCommand/>
-        <MakefileGenerationCommand/>
-        <ThirdPartyToolName>None</ThirdPartyToolName>
-        <WorkingDirectory>$(WorkspacePath)</WorkingDirectory>
-      </CustomBuild>
-      <AdditionalRules>
-        <CustomPostBuild/>
-        <CustomPreBuild/>
-      </AdditionalRules>
-      <Completion EnableCpp11="no" EnableCpp14="no">
-        <ClangCmpFlagsC/>
-        <ClangCmpFlags/>
-        <ClangPP/>
-        <SearchPaths/>
-      </Completion>
-    </Configuration>
-  </Settings>
-</CodeLite_Project>