new cfg (kv) reader implemented

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 +0,0 @@
-include ../Config.mak
-
-WITH_GNUTLS=1
-WITH_OPENSSL=1

src/Config.default.mak

@@ -1,47 +0,0 @@
-# 
-# OpenSSL definitions
-# Chose either the contrib version or the system installed version
-#
-
-#OPENSSL_VERSION=openssl-1.0.1i
-#OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl
-#OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/
-
-OPENSSL_LIBS=-lssl -lcrypto #-ldl
-OPENSSL_CFLAGS=
-
-
-
-# GnuTLS definitions
-# GNUTLS_VERSION=3.3.9
-
-USE_CONTRIB_GNUTLS=0
-
-
-COMPDEFS=-DWITH_CW_LOG
-COMPDEFS+=-DWITH_CW_LOG_DEBUG
-
-#
-# LIBCW settings
-
-# WITH_GNUTLS
-# compile in support for GnuTLS
-#
-WITH_GNUTLS=1
-
-# 
-# Compile in openssl support
-#
-WITH_OPENSSL=1
-
-# 
-# 
-LIBDIR=lib 
-
-OPTFLAGS := -g -O0
-#CFLAGS	:=	-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE=1 -pedantic -std=c99 -Wall
-
-
-
-
-

src/Defs.mak

@@ -1,5 +1,6 @@
-ifndef ARCH
+ARCH!=uname -m
-	ARCH = $(shell uname -m)
+KERNEL!=uname -s
-endif
+
+-include LocalDefs.mak
 
 

src/Macros.mak

@@ -1,51 +0,0 @@
-ifeq (${USE_CONTRIB_OPENSSL},1)
-OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl
-OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/
-else
-OPENSSL_LDFLAGS=
-OPENSSL_CFLAGS=
-OPENSSL_LIBS=-lssl -lcrypto #-ldl
-endif
-
-ifeq ($(USE_CONTRIB_GNUTLS),1)
-GNUTLS_CFLAGS=-I../contrib/gnutls-${GNUTLS_VERSION}/lib/includes
-GNUTLS_LIBS=-lgmp -lgnutls -lnettle
-GNUTLS_LDFLAGS=-L../contrib/gnutls-${GNUTLS_VERSION}/lib/.libs/ 
-else
-GNUTLS_CFLAGS=
-GNUTLS_LIBS=-lgnutls -lnettle -lgmp
-GNUTLS_LDFLAGS=
-endif
-
-
-ifeq ($(CC),clang)
-LDFLAGS		+= -g -L/usr/local/lib 
-CFLAGS 		+= -fPIC $(OPTFLAGS) -D_REENTRANT  -I /usr/local/include -I../
-LD		= clang
-endif
-
-ifeq ($(CC),gcc)
-LDFLAGS		+= -g -L/usr/local/lib 
-CFLAGS 		+= -fPIC $(OPTFLAGS) -D_REENTRANT  -I /usr/local/include -I../
-LD		= gcc
-endif
-
-ifeq ($(CC),tcc)
-LDFLAGS		+= -g -L/usr/local/lib 
-CFLAGS 		+= -Wall $(OPTFLAGS) -Wunusupported  -Wimplicit-function-declaration -I /usr/local/include -I../
-LD		= tcc 
-endif
-
-ifeq ($(CC),cc)
-LDFLAGS		+= -g -L/usr/local/lib 
-CFLAGS 		+= -fPIC $(OPTFLAGS)  -D_REENTRANT  -I /usr/local/include -I../
-LD		= cc
-endif
-
-
-
-CFLAGS		+= -DWITH_IPV6 -DWITH_RMAC_SUPPORT
-
-
-
-

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

@@ -1,5 +1,6 @@
-include ../Config.default.mak
+#include ../Config.default.mak
--include ../Config.mak
+#-include ../Config.mak
+include ../Defs.mak
 
 OBJS = \
 	wtplist.o wtpman.o conf.o ac_main.o \
@@ -11,23 +12,23 @@ OBJS = \
 	discovery_cache.o\
 	shell.o\
 
-ARCH != uname -m
 PRG=actube
-LIBPATH=-L../../lib/$(ARCH)/ -L/usr/local/lib -L/usr/lib 
+LIBPATH=-L../../lib/Linux/$(ARCH)/ -L/usr/local/lib -L/usr/lib 
-
 
+LIBS+=-lmavl
 LIBS+=-lcw
 LIBS+=-lrt
 LIBS+=-lpthread
 LIBS+=-lconfuse
 LIBS+=-lsqlite3
 LIBS+=-lc
+LIBS+=-lnettle
+LIBS+=-lssl
 LIBS+=$(OPENSSL_LIBS)
 
-
+INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include
-INCL_DIRS=-I../ -I/usr/local/include -I./
 #FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
-FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH='"$(ARCH)"'
+FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(ARCH)"'
 
 .c.o:
 	@echo "  $(CC) "$<

src/ac/ac.conf

@@ -184,7 +184,7 @@ ssl_key="../../ssl/certs/ac-cisco.key"
 # SSL certificate that will be sent to the client
 #
 # Default:
-ssl_cert="../../ssl/certs/ac-cisco.pem"
+ssl_cert="../../ssl/certs/ac-xcisco.pem"
 
 
 # dtls_verify_peer
@@ -197,31 +197,31 @@ ssl_cert="../../ssl/certs/ac-cisco.pem"
 # dbg
 # Set debug level
 # 
- dbg =  info         	# Show all kind of infos
+# dbg =  info         	# Show all kind of infos
 # dbg += all
- dbg += msg_in        	# Incomming CAPWAP messages
+# dbg += msg_in        	# Incomming CAPWAP messages
- dbg += msg_out	# Outgoing CAPWAP messages
+# dbg += msg_out	# Outgoing CAPWAP messages
- dbg += msg_err      	# Be verbose about capwap message errors like re-transmission
+# dbg += msg_err      	# Be verbose about capwap message errors like re-transmission
- dbg += msg_dmp
+# dbg += msg_dmp
- dbg += elem_in     	# CAPWAP message elements
+# dbg += elem_in     	# CAPWAP message elements
- dbg += elem_out
+# dbg += elem_out
- dbg += subelem		#
+# dbg += subelem		#
- dbg += elem_err	# Errors in message elements
+# dbg += elem_err	# Errors in message elements
- dbg += elem_dmp  	# Print hex dump for capwap messages elements
+# dbg += elem_dmp  	# Print hex dump for capwap messages elements
- dbg += rfc          	# Show warnings if CAPWAP messages don't conform to RFC
+# dbg += rfc          	# Show warnings if CAPWAP messages don't conform to RFC
- dbg += pkt_in		# CAPWAP packets received
+# dbg += pkt_in		# CAPWAP packets received
- dbg += pkt_out		# CAPWAP packets sent
+# dbg += pkt_out		# CAPWAP packets sent
- dbg += pkt          	# CAPWAP packets both sent and received
+# dbg += pkt          	# CAPWAP packets both sent and received
- dbg += pkt_dmp      	# Hex dump CAPWAP packets.
+# dbg += pkt_dmp      	# Hex dump CAPWAP packets.
- dbg += pkt_err      	# Show messages about malformed packets when detected
+# dbg += pkt_err      	# Show messages about malformed packets when detected
- dbg += dtls         	# Messages concerning DTLS
+# dbg += dtls         	# Messages concerning DTLS
 # dbg += dtls_detail	# DTLS in more detail
- dbg += dtls_bio	# DTLS BIO operations
+# dbg += dtls_bio	# DTLS BIO operations
 # dbg += dtls_bio_dmp	# HeXy dump data in BIO operations
- dbg += warn		# misc warnings	
+# dbg += warn		# misc warnings	
- dbg += mod		# Debugs specific to  mod
+# dbg = mod		# Debugs specific to  mod
- dbg += cfg_dmp
+# dbg += cfg_dmp
- dbg += state
+# dbg += state
 #
 # dbg += all         	# all of the above
 # dbg += err          	# Same as dbg_err and pkt_err
@@ -239,7 +239,7 @@ ssl_cert="../../ssl/certs/ac-cisco.pem"
 #
 
 #mods = { cisco, capwap }
-mods = { cisco,  capwap, capwap80211 }
+mods = { cisco,capwap, capwap80211 }
 #, capwap80211 }
 
-mods_dir = ../../lib
+mods_dir =  ../../lib/Linux/x86_64/

src/ac/ac.h

@@ -1,7 +1,8 @@
 #ifndef __ACTUBE_AC_H
 #define __ACTUBE_AC_H
 
-#include "cw/mavl.h"
+#include "mavl.h"
+#include "cw/mavltypes.h"
 
 extern mavl_t actube_global_cfg;
 

src/ac/ac_global.c

@@ -13,6 +13,7 @@
 #include "wtpman.h"
 #include "discovery_cache.h"
 
+#include "cw/mavltypes.h"
 mavl_t actube_global_cfg;
 
 

src/ac/ac_main.c

@@ -46,21 +46,11 @@
 
 #include "dataman.h"
 
+#include "cw/cfg.h"
 
 int ac_run();
 
 
-static void *alive_thread (void *data)
-{
-	/* Ping the database every 5 seconds */
-	while (1) {
-		sleep (5);
-		db_ping();
-	}
-	return NULL;
-}
-
-
 #include <getopt.h>
 
 
@@ -136,68 +126,6 @@ extern void test_sets();
 #include "cw/ktv.h"
 
 
-struct mykv {
-	int key;
-	int value;
-};
-
-int mycmp (void *e1, void *e2)
-{
-	struct mykv * k1 = e1;
-	struct mykv * k2 = e2;
-	
-/*//printf("My CMP: %d and %d\n", k1->key, k2->key);
-*/
-	if (k1->key > k2->key)
-		return 1;
-		
-	if (k1->key < k2->key)
-		return -1;
-		
-	return 0;
-}
-
-void mavl_walk (struct mavlnode  * node)
-{
-	struct mykv * kv;
-	
-	if (!node) {
-		printf ("\n");
-		return;
-	}
-	
-	kv = mavlnode_dataptr (node);
-	printf ("KV %d\n", kv->key);
-	
-	printf ("go left:");
-	mavl_walk (node->left);
-	printf ("go right:");
-	mavl_walk (node->right);
-	
-}
-
-/*
-int stcmp (const void * sa1, const void *sa2)
-{
-	const char **s1 = sa1;
-	const char **s2 = sa2;
-	int rc;
-	rc = strcmp (*s1, *s2);
-	
-	printf ("CMP %s, %s = %d\n", *s1, *s2, rc);
-	return rc;
-}
-*/
-/*
-static int ibcmp(const void *v1, const void *v2)
-{
-	int *i1,*i2;
-	i1=v1;i2=v2;
-	
-	return *i1-*i2;
-}
-*/
-
 #include "discovery_cache.h"
 void tester1()
 {
@@ -223,6 +151,44 @@ void tester1()
 }
 
 
+static void show_cfg (FILE *out, mavl_t ktv)
+{
+	char value[500];
+	struct cw_KTV * data;
+	mavliter_t it;
+	const struct cw_Type * type;
+	
+	
+	mavliter_init(&it,ktv);
+
+	mavliter_foreach(&it){
+		
+		data = mavliter_get(&it);
+		type = data->type;
+		type->to_str(data,value,0);
+		
+		fprintf(out,"%s :%s: %s\n",data->key,type->get_type_name(data), value);
+	}
+	
+	
+}
+
+/*
+	{
+		cw_Cfg_t * cfg;
+		cfg=cw_cfg_create();
+
+		cw_cfg_load("tube.akv",cfg);
+
+//		cw_cfg_set(cfg,"cisco/tube","99");
+//		cw_cfg_set(cfg,"Hello","30");
+	
+		cw_cfg_dump(cfg);
+		mavl_destroy(cfg);
+	}
+*/
+	
+
 int main (int argc, char *argv[])
 {
 	int rc = 0;
@@ -232,6 +198,8 @@ int main (int argc, char *argv[])
 	const cw_Type_t **ti;
 
 
+
+
 	/* parse arguments */
 	parse_args (argc, argv, &bootcfg);
 
@@ -243,10 +211,11 @@ int main (int argc, char *argv[])
                 exit(EXIT_FAILURE);
         }
 
+
 	/* create 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);
 	}
 	
 	global_cfg = cw_ktv_create();
@@ -259,28 +228,18 @@ int main (int argc, char *argv[])
 
 	fclose(file);
 
-
 	actube_global_cfg = global_cfg;
 
-/*	cw_dbg_opt_level=0xffffffff;*/
-	cw_dbg(DBG_INFO,"Hello world");
-
 
 	cw_dbg_ktv_dump(global_cfg,DBG_INFO,NULL,"CFG:",NULL);
 
-/*	int idx;
-	idx = cw_ktv_idx_get(global_cfg,"capwap-control-ip-address/address",0,CW_TYPE_IPADDRESS);
-	printf("IDX: %d\n");
 
-exit(0);
-*/
 	cw_log_name = "AC-Tube";
 	
 	if (!read_config ("ac.conf"))
 		return 1;
 		
-start_shell();
+	start_shell();
-
 
 
 	/* Show debug options if there are any set */
@@ -288,7 +247,7 @@ start_shell();
 		cw_log (LOG_INFO, "Debug Options: %08X", cw_dbg_opt_level);
 		
 	/* XXX Hard coded debug settigns, set it by config in the future */
-	cw_dbg_opt_display = DBG_DISP_ASC_DMP | DBG_DISP_COLORS;
+//	cw_dbg_opt_display = DBG_DISP_ASC_DMP | DBG_DISP_COLORS;
 	
 	/* Warn, if the "secret" debugging feature for
 	   developers is turned on ;) */
@@ -316,11 +275,6 @@ start_shell();
 	db_ping();
 	
 
-	/* Start a database "pinger thread", which inserts
-	   every xx seconds a timestamp into the DB */
-	pthread_t alth;
-	pthread_create (&alth, NULL, alive_thread, NULL);
-	
 	/* Init DTLS library */
 	dtls_init();
 		

src/ac/conf.c

@@ -37,6 +37,8 @@
 #include "conf.h"
 #include "ac.h"
 
+#include "cw/mavltypes.h"
+
 uint8_t conf_macaddress[12];
 uint8_t conf_macaddress_len = 0;
 
@@ -195,48 +197,6 @@ static int init_vendor_id()
 	return 1;
 }
 
-/*
-static int init_version()
-{
-
-	// Init hardware version 
-	if (!conf_hardware_version) {
-		struct utsname u;
-		int rc = uname(&u);
-		if (rc < 0)
-			conf_hardware_version =
-			    (bstr_t) strdup(CONF_DEFAULT_HARDWARE_VERSION);
-		else {
-			char str[265];
-			sprintf(str, "%s / %s %s", u.machine, u.sysname, u.release);
-			conf_hardware_version = (bstr_t) strdup(str);
-		}
-
-	}
-	bstr_replace(&conf_hardware_version,
-		     bstr_create_from_cfgstr((char *) conf_hardware_version));
-
-	// software version 
-	if (!conf_software_version)
-		conf_software_version = (bstr_t) strdup(CONF_DEFAULT_SOFTWARE_VERSION);
-	bstr_replace(&conf_software_version,
-		     bstr_create_from_cfgstr((char *) conf_software_version));
-
-
-	// Cisco hardware version 
-	if (!conf_cisco_hardware_version)
-		conf_cisco_hardware_version =
-		    (bstr_t) strdup(CONF_DEFAULT_CISCO_HARDWARE_VERSION);
-	bstr_replace(&conf_cisco_hardware_version,
-		     bstr_create_from_cfgstr((char *) conf_cisco_hardware_version));
-
-
-
-
-	return 1;
-}
-*/
-
 static int init_control_port()
 {
 	char str[30];
@@ -279,10 +239,8 @@ static int init_listen_addrs()
 
 		if (ifa->ifa_addr->sa_family == AF_INET && conf_ipv4)
 			ctr++;
-#ifdef WITH_IPV6
 		if (ifa->ifa_addr->sa_family == AF_INET6 && conf_ipv6)
 			ctr++;
-#endif
 	}
 
 	conf_listen_addrs = malloc(sizeof(char *) * ctr);
@@ -393,7 +351,8 @@ int init_bcast_addrs()
 	if (!conf_ipv4)
 		return 1;
 
-	t = mavl_create_str();
+	/*t = mavl_create_ptr(); */
+	t = mavl_create_ptr(mavl_cmpstr,mavl_freeptr);
 	if (t==NULL)
 		return 0;
 
@@ -534,14 +493,6 @@ static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
 }
 
 
-/*
-struct conf_dbg_level_names{
-	const char *name;
-	int level;
-};
-
-*/
-
 
 static int conf_read_dbg_level(cfg_t * cfg)
 {
@@ -568,6 +519,7 @@ char *conf_mods_dir = NULL;
  * Read the module names from config file
  */ 
 static int conf_read_mods(cfg_t *cfg){
+
 	int n, i;
 	n = cfg_size(cfg,CFG_ENTRY_MODS);
 	
@@ -587,24 +539,6 @@ static int conf_read_mods(cfg_t *cfg){
 	return 1;
 }
 
-/*
-void conf_init_capwap_mode()
-{
-	if (conf_capwap_mode_str == NULL)
-		return;
-
-	if (0 == strcmp(conf_capwap_mode_str, "cipwap")) {
-		conf_capwap_mode = CW_MODE_CIPWAP;
-	}
-
-	if (0 == strcmp(conf_capwap_mode_str, "capwap")) {
-		conf_capwap_mode = CW_MODE_CAPWAP;
-	}
-
-
-}
-*/
-
 
 int conf_parse_listen_addr(const char *addrstr, char *saddr, char *port, int *proto)
 {
@@ -798,6 +732,7 @@ int read_config(const char *filename)
 		}
 	}
 
+
 	if (!conf_read_mods(cfg)){
 		cfg_free(cfg);
 		return 0;

src/ac/config.ktv

@@ -29,7 +29,7 @@ ac-descriptor/software/vendor :Dword: 4232704
 ac-descriptor/software/version :Bstr16: .x07036500
 ac-descriptor/station-limit :Word: 1000
 ac-descriptor/stations :Word: 0
-capwap-control-ip-address/address.0 :IPAddress: 192.168.0.29
+capwap-control-ip-address/address.0 :IPAddress: 192.168.0.14
 #capwap-control-ip-address/address.0 :IPAddress: 192.168.42.51
 capwap-control-ip-address/wtps.0 :Word: 2
 cisco/mwar-type :Byte: 0
@@ -37,24 +37,28 @@ maximum-message-length :Word: 4096
 radio/0/wtp-radio-information :Dword: 7
 result-code :Dword: 0
 
+cisco/ap-telnet-ssh/ssh :Bool: true
+cisco/ap-telnet-ssh/telnet :Bool: true
 
 
 ac-name:Bstr16:"X1"
 
 #capwap-control-ip-address/address.0:IPAddress:1192.168.0.14
-capwap-control-ip-address/address.0:IPAddress:192.168.0.29
+capwap-control-ip-address/address.0:IPAddress:192.168.0.14
 #capwap-control-ip-address/address.0:IPAddress:192.168.0.131
 #capwap-control-ip-address/address.1:IPAddress:2a00:c1a0:48c6:4a00:9965:1b6e:aca3:1398
 capwap-control-ip-address/wtps.0:Word:0
 #capwap-control-ip-address/wtps.1:Word:11
 
+#cisco/ssl-keyfile:Str:"../../ssl/certs/ac.key"
+#cisco/ssl-certfile:Str:"../../ssl/certs/ac.crt"
 
 #cisco/ssl-keyfile:Str:"../../ssl/certs/ac-cisco.key"
 #cisco/ssl-certfile:Str:"../../ssl/certs/ac-cisco.pem"
-#cisco/ssl-keyfile:Str:"../../ssl/certs/int-ca.key"
-#cisco/ssl-certfile:Str:"../../ssl/certs/int-ca.crt"
 cisco/ssl-keyfile:Str:"../../ssl/intermediate-ca/int-ca.key"
 cisco/ssl-certfile:Str:"../../ssl/intermediate-ca/int-ca.crt"
+#cisco/ssl-keyfile:Str:"../../ssl/intermediate-ca/cisco-ac-int-ca.key"
+#cisco/ssl-certfile:Str:"../../ssl/intermediate-ca/cisco-ac-int-ca.crt"
 cisco/ssl-cipher:Str:DEFAULT:!ECDH
 #cisco/ssl-cipher:Str:+DHE-RSA:+AES-256-CBC:+AES-128-CBC:+SHA1
 cisco/ssl-dhbits:Word:2048
@@ -107,7 +111,7 @@ radio.1/cisco/multi-domain-capability/max-tx-power-level :Word: 20
 radio.1/cisco/multi-domain-capability/number-of-channels :Word: 4
 radio.1/cisco/multi-domain-capability/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/bss-id :Bstr16: .x05fe7f499b90
 radio.1/cisco/wtp-radio-config/cfg-period :Byte: 4
 radio.1/cisco/wtp-radio-config/cfg-type :Byte: 1
 radio.1/cisco/wtp-radio-config/cfp-maximum-duration :Word: 60

src/ac/dataman.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include "cw/mavl.h"
+#include "mavl.h"
 #include "cw/sock.h"
 #include "cw/timer.h"
 #include "cw/cw.h"
@@ -86,7 +86,7 @@ struct dataman *dataman_list_add(struct dataman *dm)
 {
 
 	cw_dbg(DBG_X,"Adding dataman %p\n",dm);
-	return mavl_add(dataman_list, dm,NULL);
+	return mavl_insert(dataman_list, dm,NULL);
 }
 
 

src/ac/db.h

@@ -1,7 +1,7 @@
 #ifndef CW_MAVL_H
 #define CW_MAVL_H
 
-#include "cw/mavl.h"
+#include "mavl.h"
 
 extern void db_ping();
 extern void db_ping_wtp(const char *wtpid,const char *acid);

src/ac/discovery_cache.c

@@ -2,7 +2,7 @@
 
 #include "cw/sock.h"
 #include "cw/mlist.h"
-#include "cw/mavl.h"
+#include "mavl.h"
 #include "cw/mod.h"
 
 #include "discovery_cache.h"
@@ -125,8 +125,8 @@ void discovery_cache_add(struct cw_DiscoveryCache *cache,
 		cache->ctrhi++;
 	}
 	
-	mavl_add_ptr(cache->byaddr,cur);
+	mavl_insert_ptr(cache->byaddr,cur);
-	mavl_add_ptr(cache->byaddrp,cur);
+	mavl_insert_ptr(cache->byaddrp,cur);
 	
 	cache->qpos++;
 	if (cache->qpos>=cache->len)

src/ac/shell.c

@@ -32,6 +32,7 @@ void ucfg_cmd(struct shelldata *sd, const char * cmd);
 void set_cmd(struct shelldata *sd, const char * cmd);
 void del_cmd(struct shelldata *sd, const char * cmd);
 void send_cmd(struct shelldata *sd, const char * cmd);
+void wlan0_cmd(struct shelldata *sd, const char * cmd);
 void show_cfg (FILE *out, mavl_t ktv);
 void show_aps (FILE *out);
 
@@ -50,6 +51,7 @@ static struct command cmdlist[]={
 	{"select", select_cmd },
 	{"send", send_cmd},
 	{"set", set_cmd },
+	{"wlan0",wlan0_cmd},
 
 	
 	{NULL,NULL}
@@ -106,6 +108,25 @@ send_cmd(struct shelldata * sd, const char *cmd)
 	wtplist_unlock();
 }
 
+void 
+wlan0_cmd(struct shelldata * sd, const char *cmd)
+{
+	struct conn * conn;
+	wtplist_lock();
+	conn = find_ap(sd->prompt);
+	if (conn==NULL){
+		fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
+	}
+	else {
+		FILE *f=fopen("wlan0.ktv","r");
+		cw_ktv_read_file(f,sd->update_cfg,conn->msgset->types_tree);
+		//conn->update_cfg=sd->update_cfg;
+		fclose(f);
+	}
+	wtplist_unlock();
+
+}
+
 void set_cmd(struct shelldata *sd, const char *str)
 {
 	struct conn * conn;
@@ -370,6 +391,7 @@ void shell_loop (FILE *file)
 {
 	struct shelldata sd;
 	int c;
+	c=0;
 	/*	setvbuf(file,NULL,_IONBF,0);
 		fflush(file);
 	*/
@@ -404,7 +426,9 @@ void * run_shell (void * arg)
 	const char * addr = "127.0.0.1:5000";
 	int sockfd, clientsock;
 	int yes;
-while(1){
+	
+
+	cw_dbg(DBG_INFO,"Staring shelli listening at: %s",addr);
 
 
 	rc = sock_strtoaddr (addr, (struct sockaddr*) &server);
@@ -435,16 +459,17 @@ while(1){
 	
 	
 	client_size = sizeof (client);
+while(1){
+	
 	clientsock = accept (sockfd, (struct sockaddr*) &client, &client_size);
 	
 	if (clientsock > 0) {
 		sock_addr2str_p (&client, sockstr);
 		cw_dbg (DBG_INFO, "Acceptiong session from %s", sockstr);
-		printf("New shell lopp\n");
+		cw_dbg (DBG_INFO, "Start shell");
 		shell_loop (fdopen (clientsock, "a+"));
-		printf("end shell lopp\n");
+		cw_dbg (DBG_INFO, "Stop shell");
 		close (clientsock);
-		printf("close clsock\n");
 	}
 	
 	

src/ac/wtpman.c

@@ -114,23 +114,6 @@ static void wtpman_run_discovery(void *arg)
 	return;
 }
 
-/*
-int xprocess_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
-		     struct sockaddr *from)
-{
-	uint8_t *msgptr = rawmsg + cw_get_hdr_msg_offset(rawmsg);
-	uint32_t type = cw_get_msg_type(msgptr);
-	cw_log(LOG_ERR, "Hey: %d", type);
-	if (type == CAPWAP_MSG_DISCOVERY_REQUEST)
-		conn->capwap_state = CAPWAP_STATE_DISCOVERY;
-
-
-	return process_message(conn, rawmsg, rawlen, from);
-}
-
-*/
-
-
 static int wtpman_dtls_setup(void *arg)
 {
 	char cipherstr[512];
@@ -148,6 +131,7 @@ static int wtpman_dtls_setup(void *arg)
 	cw_dbg(DBG_DTLS, "DTLS session established with %s, %s",
 	       sock_addr2str_p(&wtpman->conn->addr,sock_buf), dtls_get_cipher(wtpman->conn,cipherstr));
 
+
 	return 1;
 }
 
@@ -386,62 +370,6 @@ static void * wtpman_main(void *arg)
 		};
 		
 		
-
-
-
-	/*	
-		switch (conn->capwap_transition){
-			case CW_TRANSITION(CAPWAP_STATE_DTLS_SETUP, CAPWAP_STATE_JOIN):
-			{
-
-				wait_join = cw_ktv_get_word(conn->global_cfg,"wait-join",CAPWAP_WAIT_JOIN);
-				timer = cw_timer_start(wait_join);
-				break;
-			}
-			case CW_TRANSITION(CAPWAP_STATE_JOIN, CAPWAP_STATE_JOIN):
-			{	
-				char wtpname[CAPWAP_MAX_WTP_NAME_LEN];
-				cw_KTV_t * result;
-				result = cw_ktv_get(conn->remote_cfg,"wtp-name",NULL);
-				result->type->to_str(result,wtpname,CAPWAP_MAX_WTP_NAME_LEN);
-				cw_dbg(DBG_INFO, "WTP joined: '%s', IP %s.",
-					wtpname,
-					sock_addr2str(&conn->addr,sock_buf)
-					);
-				break;
-			}
-			case CW_TRANSITION(CAPWAP_STATE_JOIN,CAPWAP_STATE_TIMEOUT):
-			{
-				cw_dbg(DBG_MSG_ERR, "No join request from %s after %d seconds, WTP died.",
-				sock_addr2str(&wtpman->conn->addr,sock_buf), wait_join);
-				wtpman_remove(wtpman);
-				return NULL;
-				break;
-			}
-			case CW_TRANSITION(CAPWAP_STATE_JOIN, CAPWAP_STATE_CONFIGURE):
-			{
-				
-				wait_change_state = cw_ktv_get_word(conn->global_cfg,
-					"capwap-timers/change-state-pending-timer",
-					CAPWAP_TIMER_CHANGE_STATE_PENDING_TIMER);
-				break;
-			}
-			case CW_TRANSITION(CAPWAP_STATE_CONFIGURE,CAPWAP_STATE_TIMEOUT):
-			{
-				cw_dbg(DBG_MSG_ERR, "No Change State Event Request %s after %d seconds, WTP died.",
-				sock_addr2str(&wtpman->conn->addr,sock_buf), wait_change_state);
-				wtpman_remove(wtpman);
-				return NULL;
-				break;
-			}
-
-		}
-		
-*/
-
-
-
-		
 		while (!cw_timer_timeout(timer)) {
 			if (conn->update_cfg != NULL){
 				mavl_t tmp;
@@ -450,7 +378,7 @@ static void * wtpman_main(void *arg)
 				tmp = conn->local_cfg;
 
 				mavl_merge(conn->default_cfg, conn->local_cfg);
-				mavl_merge(conn->default_cfg, conn->remote_cfg);
+/*				mavl_merge(conn->default_cfg, conn->remote_cfg);*/
 
 				conn->local_cfg=conn->update_cfg;
 								
@@ -461,6 +389,8 @@ static void * wtpman_main(void *arg)
 				cw_dbg(DBG_INFO, "Updating WTP %s",sock_addr2str(&conn->addr,sock_buf));
 
 				rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
+				mavl_merge(conn->remote_cfg,conn->update_cfg);
+
 				conn->update_cfg=NULL;
 				conn->local_cfg=tmp;
 			}
@@ -577,7 +507,7 @@ cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,"-------------dump------------","DMP",
 		}
 
 /*//		cw_dbg(DBG_X, "Time left: %d",
-//*/
+// */
 	       /*cw_timer_timeleft(wtpman->echointerval_timer);*/
 	       
 		if (cw_timer_timeout(wtpman->echointerval_timer)) {

src/contrib/install_libmavl.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+VERSION="1.1.0a"
+
+wget -O libmavl-${VERSION}.tgz ftp://ftp.planix.org/pub/planix/libmavl-${VERSION}.tgz
+tar xzvf libmavl-${VERSION}.tgz
+cd libmavl-${VERSION}
+cp ../libmavl-LocalDefs.mak .
+make install
+

src/contrib/install_openssl111.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+
+VERSION="1.1.1f"
+#VERSION="1.0.1l"
+#VERSION="1.0.2"
+
+if [ ! -e openssl-${VERSION}.tar.gz ]
+then
+wget https://www.openssl.org/source/openssl-${VERSION}.tar.gz
+fi
+
+tar xzvf openssl-${VERSION}.tar.gz
+#patch -p0 -i openssl-${VERSION}_cisco.patch
+cd openssl-${VERSION}
+./config
+make -j16
+
+

src/contrib/libmavl-LocalDefs.mak

@@ -0,0 +1,6 @@
+include ../../Defs.mak
+
+PREFIX=../../..
+INSTALL_LIB_DIR := /lib/$(KERNEL)/$(ARCH)
+INSTALL_INCLUDE_DIR := /include
+

src/cw/Makefile

@@ -1,40 +1,5 @@
 include ../Defs.mak
-include ../CWConfig.mak
+MFDEPS=../Defs.mak ../LocalDefs.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=\
@@ -98,6 +63,7 @@ CWSRC=\
 	cw_strlist_get_id.c\
 	cw_strlist_get_str.c\
 	cw_type_bstr16.c\
+	cw_type_bwstr.c\
 	cw_type_byte.c\
 	cw_type_bool.c\
 	cw_type_str.c\
@@ -139,6 +105,8 @@ KTVSRC=\
 	cw_ktv_base_exists.c\
 	cw_ktv_save.c\
 	cw_ktv_del_sub.c\
+	cfg.c\
+
 
 
 LWSRC=\
@@ -156,32 +124,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\
@@ -227,7 +169,6 @@ MISCSRC=\
 	bstr_create.c\
 	bstr_create_from_str.c\
 	bstr_replace.c\
-	bstrv_create.c\
 	capwap_inline.c\
 	capwap_strings_board.c\
 	capwap_strings_elem80211.c\
@@ -243,6 +184,7 @@ MISCSRC=\
 	connlist.c\
 	conn_prepare_image_data_request.c\
 	conn_process_packet.c\
+	cw_decode_msg.c \
 	conn_q_add_packet.c\
 	conn_q_get_packet.c\
 	conn_q_wait_packet.c\
@@ -275,60 +217,52 @@ RADIOSRC=\
 	cw_out_radio_generic_struct.c\
 	cw_read_radio_generic.c\
 
+MAVLSRC=\
+	mavl_get_ptr.c\
+	mavl_insert_ptr.c\
+	mavl_replace.c\
+	mavliter_get_ptr.c\
+	mavl_cmpstr.c\
+	mavl_freeptr.c \
+	mavl_merge.c\
+
+
+DTLSSRC += dtls_openssl.c \
+	dtls_openssl_accept.c \
+	dtls_openssl_connect.c \
+	dtls_openssl_get_cipher.c \
+	dtls_openssl_bio.c 
+LIBS=
+
+#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))
 
 
+
+LIBDIR          := ../../lib
+LIBARCHDIR      := $(LIBDIR)/$(KERNEL)/$(ARCH)
+OBJDIR          := ../../obj/cw/$(KERNEL)/$(ARCH)
+
+SNAME           := $(LIBARCHDIR)/libcw.a
+DNAME           := $(LIBARCHDIR)/libcw.so
+
+CFLAGS+=-fPIC -DUSE_OPENSSL -O0 -I../../include
+CFLAGS+=-g 
+
 all: $(SNAME) $(DNAME) 
+static: $(SNAME)
+dynamic: $(DNAME)
 	
-
+include ../lib.mk
-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)/*
-	$(RM) $(DNAME)
-	$(RM) $(SNAME)
-	
-
-clean_deps:
-	$(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/cfg.c

@@ -0,0 +1,355 @@
+#include <string.h>
+#include <ctype.h>
+
+#include <mavl.h>
+
+#include "cw.h"
+#include "cfg.h"
+
+struct cfg_entry{
+	char *key;
+	char *val;
+};
+
+static int cmp(const void *k1,const void*k2){
+	struct cfg_entry * e1,*e2;
+	e1=(struct cfg_entry *)k1;
+	e2=(struct cfg_entry *)k2;
+	return strcmp(e1->key,e2->key);
+}
+
+static void del(void *ptr)
+{
+	struct cfg_entry * e;
+	e=(struct cfg_entry *)ptr;
+	free(e->key);
+	free(e->val);
+}
+
+
+cw_Cfg_t * cw_cfg_create()
+{
+	return mavl_create(cmp, del, sizeof(struct cfg_entry));
+}	
+
+int cw_cfg_set(cw_Cfg_t * cfg,const char *key, const char *val)
+{
+	struct cfg_entry e;
+	int replaced;
+
+	e.key = cw_strdup(key);
+	if (!e.key)
+		return 0;
+	e.val = cw_strdup(val);
+	if (!e.val){
+		free(e.key);
+		return 0;
+	}
+	void * rc = mavl_replace(cfg,&e,&replaced);
+	if (!rc){
+		del(&e);
+		return 0;
+	}
+
+	if (!replaced)
+		return 1;
+	return -1;
+}
+
+void cw_cfg_dump(cw_Cfg_t *cfg)
+{
+	mavliter_t it;
+	struct cfg_entry *e;
+	mavliter_init(&it,cfg);
+	mavliter_foreach(&it){
+		
+		e = mavliter_get(&it);
+		printf("%s: '%s'\n",e->key,e->val);
+		//cw_dbg(dbglevel,"%s%s :%s: %s",prefix,data->key,type->get_type_name(data), value);
+	}
+}
+
+
+struct parser {
+	int line;
+	int pos;
+	int prevpos;
+	char error[256];
+	int quote;
+	FILE *f;
+	int (*getc)(struct parser *);
+	void (*ungetc)(struct parser *);
+};
+
+static int get_char(struct parser *p)
+{
+	int c;
+	c = fgetc (p->f);
+	p->pos++;
+	if (c=='\n'){
+		p->prevpos=p->pos;
+		p->line ++;
+		p->pos=0;
+	}
+	return c;
+}
+
+static void unget_char(struct parser *p,int c){
+	ungetc(c,p->f);
+	if (c=='\n'){
+		p->line--;
+		p->pos=p->prevpos;
+	}
+	else
+		p->pos--;
+}
+
+
+
+static int get_char_q(struct parser *p)
+{
+	int c;
+
+	while(1) {
+		c = get_char(p);
+		if (c==EOF || c=='\n')
+			return c;
+	
+		if(c=='"' && !p->quote){
+			p->quote=1;
+			continue;
+		}
+		if(c=='"' && p->quote){
+			p->quote=0;
+			continue;
+		}
+		break;
+	}
+	
+	
+	if (!p->quote)
+		return c;
+			
+	if (c!='\\')
+		return c;
+			
+	c = get_char(p);
+	switch(c){
+		case EOF:
+			return c;
+		case 'n':
+			return '\n';
+			
+		case '\\':
+			return '\\';
+		case '"':
+			return '"';
+		default:
+			unget_char(p,c);
+			return '\\';
+	}
+			
+	/* We will never reach here */
+	/* return c;*/
+}
+
+static int skip_chars (struct parser *p, const char * chars)
+{
+	int c;
+	
+	while ( (c = get_char (p)) != EOF) {
+		if (strchr (chars, c))
+			continue;
+		return c;
+	}
+	return c;
+}
+
+static int skip_to_chars (struct parser *p, const char *chars)
+{
+	int c;
+	
+	while ( (c = get_char (p)) != EOF) {
+		if (strchr (chars, c))
+			return c;
+	}
+	return c;
+}
+
+
+
+static int read_key (struct parser *p, char *key, int max_len)
+{
+	int c,n;
+
+	do {
+		c = skip_chars (p, " \t\n\a\v");
+		if (c == '#') {
+			c = skip_to_chars (p, "\n\a");
+			
+		} else {
+			break;
+		}
+	} while (c != EOF);
+	
+	unget_char(p,c);
+	c=get_char_q(p);
+
+	n=0;
+	while(c!=EOF && n<max_len){
+		if (!p->quote && !isalnum(c) && !strchr("._/-()@#|{}[]\\",c)/*strchr(": \t\n\a",c)*/){
+			unget_char(p,c);
+			break;
+		}
+
+		key[n]=c;
+
+		c=get_char_q(p);
+		n++;
+
+	}
+	key[n]=0;
+	return n;
+}
+
+
+static int skip_to_colon(FILE *f,struct parser * p)
+{
+	int c;
+	c = skip_chars (p, " \t");
+	if (c!=':'){
+		if (c=='\n'){
+			unget_char(p,c);
+			sprintf(p->error,"Error at line %d, pos %d: Unexpected EOL, collon expected.", p->line, p->pos);
+			return 0;
+		}
+		sprintf(p->error,"Error at line %d, pos %d: Collon expected.", p->line, p->pos);
+		return 0;
+	}
+	return 1;
+}
+
+
+
+static int read_val(struct parser *p, char *val, int max_len){
+	int c,n,quote;
+	if (!skip_to_colon(p->f,p))
+		return -1;
+	c = skip_chars (p, " \t");
+	if (c=='"'){
+		quote=1;
+		c=get_char(p);
+	}
+	else{
+		quote=0;
+	}
+	n=0;
+	while(c!=EOF && n<max_len){
+		if (quote && c=='"'){
+			break;
+		}
+		if (c=='\n'){
+			break;
+		}
+		if (quote){
+			if (c=='\\'){
+				c = get_char(p);
+				switch(c){
+					case 'n':
+						c='\n';
+						break;
+					case '\\':
+						break;
+					case '"':
+						break;
+					default:
+						unget_char(p,c);
+						c='\\';
+				}
+			}
+		}
+		val[n++]=c;
+		c=get_char(p);
+	}
+	
+	
+	if(!quote && n>0){
+		while(n>0){
+			if (isspace(val[n-1]))
+				n--;
+			else
+				break;
+		}
+	}
+	
+	val[n]=0;
+
+	return n;
+
+}
+
+
+
+int cw_cfg_read_line (FILE *f, struct parser *p, char * key, char *val)
+{
+	int n;
+
+	
+	n = read_key (p,key,CW_CFG_MAX_KEY_LEN);
+	if (n==0)
+		return 1;
+	if (n==-1){
+		return -1;
+	}
+
+	n = read_val (p,val,CW_CFG_MAX_KEY_LEN);
+	if (n==-1){
+		return -1;
+	}
+	return 0;
+}
+
+int cw_cfg_read_from_file(FILE * f, cw_Cfg_t * cfg)
+{
+	char key[CW_CFG_MAX_KEY_LEN];
+	char val[2048];
+	struct parser p;
+
+	p.line=1;
+	p.pos=0;
+	p.prevpos=0;
+	p.quote=0;
+	p.f=f;
+	
+	int rc;
+
+	
+	do {
+
+		rc = cw_cfg_read_line(f,&p,key,val);
+		if (rc==-1){
+			fprintf(stderr,"Error: %s",p.error);
+		}
+
+
+		if (rc != 0){
+			continue;
+		}
+
+		cw_cfg_set(cfg,key,val);
+	
+
+	}while(rc==0);
+	
+	return 0;
+}
+
+
+int cw_cfg_load(const char *filename,cw_Cfg_t * cfg)
+{
+	FILE *f = fopen(filename,"rb");
+	if (!f)
+		return errno;
+	cw_cfg_read_from_file(f,cfg);
+	return 0;
+}

src/cw/cfg.h

@@ -0,0 +1,18 @@
+#ifndef _CFG_H
+#define _CFG_H
+
+#include <mavl.h>
+
+#define CW_CFG_MAX_KEY_LEN 1024
+
+typedef struct mavl cw_Cfg_t;
+
+cw_Cfg_t * cw_cfg_create();
+int cw_cfg_set(cw_Cfg_t *cfg,const char *key, const char *val);
+void cw_cfg_dump(cw_Cfg_t *cfg);
+int cw_cfg_read_from_file(FILE * file, cw_Cfg_t * cfg);
+int cw_cfg_load(const char *filename,cw_Cfg_t * cfg);
+
+
+#endif
+

src/cw/conn.h

@@ -203,7 +203,7 @@ struct conn {
 	int dtls_verify_peer;
 	int dtls_mtu;
 
-	uint8_t dtls_buffer[2048];
+	uint8_t dtls_buffer[4096];
 	int dtls_buffer_len;
 	int dtls_buffer_pos;
 

src/cw/conn_create.c

@@ -90,7 +90,7 @@ struct conn * conn_create(int sock, struct sockaddr * addr, int qsize)
 /*	conn->send_data_packet = conn_send_data_packet;*/
 
 	conn->last_seqnum_received=-1;
-	conn->mtu=1500;
+	conn->mtu=600;
 
 
 	conn->cur_packet=0;
@@ -102,7 +102,7 @@ struct conn * conn_create(int sock, struct sockaddr * addr, int qsize)
 
 /*	conn->write_data = conn->send_data_packet; */
 
-	conn->dtls_mtu = 1500;
+	conn->dtls_mtu = 600;
 
 	return conn;
 }

src/cw/conn_create_noq.c

@@ -67,7 +67,8 @@ struct conn * conn_create_noq(int sock, struct sockaddr * addr)
 
 	/* misc settings */
 	conn->last_seqnum_received=-1;
-	conn->mtu=1500;
+	conn->mtu=480;
+	conn->dtls_mtu=500;
 
 
 	conn->cur_packet=0;

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;
 	
@@ -333,7 +333,7 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 	ui = message->states;
 
 	for (ui=message->states; ui->state; ui++){
-		printf("Comparing %d and %d\n", conn->capwap_state, ui->state);
+/*		printf("Comparing %d and %d\n", conn->capwap_state, ui->state);*/
 		if(ui->state==conn->capwap_state){
 			break;
 		}
@@ -398,7 +398,14 @@ static int process_elements(struct conn *conn, uint8_t * rawmsg, int len,
 	
 
 		
-		params.conn=conn;
+/*		params.conn=conn;*/
+
+                params.local_cfg=conn->local_cfg;
+                params.remote_cfg=conn->remote_cfg;
+                params.default_cfg=conn->default_cfg;
+                params.global_cfg=conn->global_cfg;
+                params.msgset=conn->msgset;
+
 		params.from=from;
 		params.msgdata=message;
 		params.mand_found=mand_found;
@@ -508,6 +515,7 @@ int process_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
 	if ((sd > 0 && sd < 128) || (sd < 0 && sd < -128) || s1 < 0) {
 		/* seqnum is ok, normal message processing */
 		conn->last_seqnum_received = seqnum;
+
 		return process_elements(conn, rawmsg, rawlen, from);
 	}
 

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 = 9440;	
+	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)
@@ -542,6 +547,8 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout);
 char *cw_strdup(const char *s);
 int cw_stricmp(char const *a, char const *b);
 
+int cw_write_header(struct cw_ElemHandler * handler, uint8_t * dst, int len);
+int cw_header_len(struct cw_ElemHandler * handler);
 
 /**
  *@}

src/cw/cw_decode_msg.c

@@ -0,0 +1,126 @@
+#include "cw.h"
+#include "dbg.h"
+#include "log.h"
+#include "msgset.h"
+
+int cw_decode_element(struct cw_ElemHandlerParams *params, int proto,
+		      int vendor, int elem_id, uint8_t * data, int len)
+{
+
+	struct cw_ElemHandler *handler;
+	struct cw_ElemData *elem_data, elem_data_search;
+	int rc;
+
+	params->elem = NULL;
+
+	/* try to retrieve a handler for this message element */
+	handler =
+	    cw_msgset_get_elemhandler(params->msgset, proto, vendor,
+				      elem_id);
+	if (!handler) {
+
+		cw_dbg(DBG_ELEM_ERR,
+		       "Unrecognized message element: %d, ignoring", elem_id);
+		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
+	}
+
+	/* check if this message element in the current message allowed */
+	elem_data_search.id = elem_id;
+	elem_data_search.proto = proto;
+	elem_data_search.vendor = vendor;
+	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);
+		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
+	}
+
+	/* check the length of the message */
+	if (len < handler->min_len) {
+		cw_dbg(DBG_ELEM_ERR,
+		       "%d (%s) message element too short, len=%d, min len=%d",
+		       handler->id, handler->name, len, handler->min_len);
+		return -1;
+	}
+
+
+	if (elem_data->mand) {
+		mavl_add_str(params->mand_found, handler->key);
+	}
+
+
+	if (len > handler->max_len && handler->max_len) {
+		cw_dbg(DBG_ELEM_ERR,
+		       "%d (%s) message element too big, len=%d, max len=%d",
+		       handler->id, handler->name, len, handler->max_len);
+		/* TODO XXX truncate the element instead of return */
+		return -1;
+	}
+
+	cw_dbg_elem(DBG_ELEM_IN, NULL, params->msgdata->type, handler,
+		    data, len);
+
+	if (handler->get == NULL) {
+		cw_log(LOG_ERR, "No get method defined for %d %s", handler->id,
+		       handler->name);
+		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
+	}
+
+	printf ("USING HANDLERi TO DECODE: %d %s\n",handler->id,handler->name);
+	rc = handler->get(handler, params, data, len);
+
+
+	return rc;
+}
+
+
+int cw_decode_elements(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
+{
+	uint8_t *elem;
+	mavl_t mand_found;
+	mlist_t unrecognized;
+
+	mand_found = mavl_create_conststr();
+	unrecognized = mlist_create(NULL,NULL,sizeof(uint8_t*));
+
+	cw_foreach_elem(elem, elems_ptr, elems_len) {
+		int rc;
+
+		int elem_len, elem_id, max_len;
+		uint8_t * elem_data;
+
+
+		elem_len = cw_get_elem_len(elem);
+		elem_data=cw_get_elem_data(elem);
+		elem_id = cw_get_elem_id(elem);
+		
+		max_len=elems_len-(elem_data-elems_ptr);
+		if (elem_len > max_len){
+			cw_dbg(DBG_RFC,
+			"Messag element claims size of %d bytes, but only %d bytes are left in the payload, truncating.",
+			elem_len,max_len-4);
+		}
+	
+		
+
+		params->from=NULL; /*from;*/
+		params->mand_found=mand_found;
+		
+		rc = cw_decode_element(params,0,0,elem_id,elem_data,elem_len); 
+		
+
+		if (cw_result_is_ok(rc))
+			continue;
+		
+		if (rc == CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT){
+			mlist_append(unrecognized,&elem);
+			continue;
+		}
+		
+		if (rc < 0 ){
+			continue;
+		}
+
+	}
+
+}

src/cw/cw_in_generic.c

@@ -14,10 +14,8 @@ int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams *
 		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
 	}
 
-	result = cw_ktv_add(params->conn->remote_cfg, handler->key, 
+	result = cw_ktv_add(params->remote_cfg, handler->key, 
 				handler->type,NULL, elem_data,elem_len);
-	
 	params->elem=result;
-	
 	return CAPWAP_RESULT_SUCCESS;
 }

src/cw/cw_in_generic_struct.c

@@ -18,6 +18,8 @@ int cw_in_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 		key = handler->key;
 	}
 
+printf("CW_IN_GENERIC STRUCT: %s\n",key);	
+
 /*	int (*mkkey)(struct cw_ElemHandler * handler, char *dst, struct cw_ElemHandlerParams * params, 
 		uint8_t*data, int len);
 */
@@ -27,7 +29,7 @@ int cw_in_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
 	}
 
-	cw_ktv_read_struct(params->conn->remote_cfg,handler->type,key,elem_data,elem_len);
+	cw_ktv_read_struct(params->remote_cfg,handler->type,key,elem_data,elem_len);
 
 	return CAPWAP_RESULT_SUCCESS;
 }

src/cw/cw_in_generic_with_index.c

@@ -9,6 +9,6 @@ int cw_in_generic_with_index(struct cw_ElemHandler *eh,
 	
 	idx = cw_get_byte(data);
 	sprintf(key,"%s.%d",eh->key,idx);
-	cw_ktv_add(params->conn->remote_cfg,key,eh->type,NULL,data+1,len-1);
+	cw_ktv_add(params->remote_cfg,key,eh->type,NULL,data+1,len-1);
 	return 1;
 }

src/cw/cw_in_idx_generic.c

@@ -16,7 +16,7 @@ int cw_in_idx_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerPara
 	idx=cw_get_byte(elem_data);
 	sprintf(key,handler->key,idx);
 	
-	result = cw_ktv_add(params->conn->remote_cfg, key, 
+	result = cw_ktv_add(params->remote_cfg, key, 
 				handler->type, NULL, elem_data+1,elem_len-1);
 	
 	params->elem=result;

src/cw/cw_in_idx_generic_struct.c

@@ -19,7 +19,7 @@ int cw_in_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHand
 	idx = cw_get_byte(elem_data);
 	sprintf(key, handler->key, idx);
 
-	cw_ktv_read_struct(params->conn->remote_cfg,handler->type,key,elem_data+1,elem_len-1);
+	cw_ktv_read_struct(params->remote_cfg,handler->type,key,elem_data+1,elem_len-1);
 
 	return CAPWAP_RESULT_SUCCESS;
 }

src/cw/cw_in_radio_generic_struct.c

@@ -19,7 +19,7 @@ int cw_in_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHa
 	radio = cw_get_byte(elem_data);
 	sprintf(key,"radio.%d/%s",radio,handler->key);
 
-	cw_ktv_read_struct(params->conn->remote_cfg,handler->type,key,elem_data+1,elem_len-1);
+	cw_ktv_read_struct(params->remote_cfg,handler->type,key,elem_data+1,elem_len-1);
 
 	/*params->elem=result;*/
 	

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

@@ -30,7 +30,7 @@ cw_KTV_t * cw_ktv_add(mavl_t kvtstore, const char *key, const struct cw_Type *ty
 	}
 
 	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_ktv_read_struct.c

@@ -8,9 +8,6 @@ int cw_ktv_read_struct(mavl_t ktv,const cw_KTVStruct_t * stru, const char *pkey,
 	int pos, i,l;
 	cw_KTV_t * result;
 	
-	if (strcmp(pkey,"radio.0/cisco/wtp-radio-config")==0)
-		i = 99;
-	
 	
 	pos=0; i=0;
 	while (stru[i].type != NULL){
@@ -47,6 +44,7 @@ int cw_ktv_read_struct(mavl_t ktv,const cw_KTVStruct_t * stru, const char *pkey,
 		
 		stru[i].type->to_str(result,dbstr,100);
 		cw_dbg(DBG_ELEM_DETAIL, "Read (%d): %s: %s",pos,key,dbstr);
+		printf("READ STRUCT (%d): %s: %s\n",pos,key,dbstr);
 		
 		if (stru[i].len==-1)
 			l = result->type->len(result);

src/cw/cw_ktv_write_struct.c

@@ -24,9 +24,15 @@ int cw_ktv_write_struct(mavl_t ktv, mavl_t def, const cw_KTVStruct_t * stru, con
 		else	
 			sprintf(key,"%s",pkey);
 
-
+printf("Get Key: %s\n",key);
 		result = cw_ktv_get(ktv,key,NULL);
 
+		if(result)
+		{
+			char s[129];
+			result->type->to_str(result,s,128);
+			printf("Content: '%s'\n",s);
+		}	
 
 		if (result == NULL && def != NULL){
 			result = cw_ktv_get(def,key,NULL);

src/cw/cw_out_generic.c

@@ -12,14 +12,14 @@ int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams
 			, uint8_t * dst)
 {
 
-	struct cw_KTV * elem, search;
+	struct cw_KTV * elem;
 	int start, len, l;
 
 	/* Get the element */
 /*	search.key=(char*)handler->key;
 	elem = mavl_get(params->conn->local_cfg, &search);
 */	
-	elem = cw_ktv_get(params->conn->local_cfg,handler->key,NULL);
+	elem = cw_ktv_get(params->local_cfg,handler->key,NULL);
 	
 /*	if (elem == NULL && params->conn->default_cfg !=NULL)
 		elem = mavl_get(params->conn->default_cfg, &search);
@@ -49,7 +49,7 @@ int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams
 	/* Size for msg elem header depends on 
 	   vendor specific payload */
 	/* start = handler->vendor ? 10 : 4; */
-	start = params->conn->header_len(handler);
+	start = params->msgset->header_len(handler);
 	
 	if (cw_ktv_cast(elem,handler->type)==NULL){
 		cw_log(LOG_ERR,"Can't put element '%s'- can't cast from %s to %s for key: %s", handler->name, 
@@ -67,9 +67,11 @@ int cw_out_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams
 		return len + cw_put_elem_vendor_hdr(dst, handler->vendor, handler->id, len);
 
 	l = len + cw_put_elem_hdr(dst, handler->id, len); */
-	l = params->conn->write_header(handler,dst,len);
+	l = params->msgset->write_header(handler,dst,len);
+	
+	cw_dbg_elem(DBG_ELEM_OUT,NULL,params->msgdata->type,handler,dst,l);
+/*	cw_dbg_elem(DBG_ELEM_OUT,params->conn,params->msgdata->type,handler,dst,l);*/
 
-	cw_dbg_elem(DBG_ELEM_OUT,params->conn,params->msgdata->type,handler,dst,l);
 	return l;
 }
 

src/cw/cw_out_generic_indexed_enum.c

@@ -10,7 +10,6 @@ int cw_out_generic_indexed_enum(struct cw_ElemHandler * handler, struct cw_ElemH
 	uint8_t * ob;
 	const cw_KTVIndexed_t *ie;
 	cw_KTVEnum_t * e;
-	struct cw_ElemHandler thandler;
 	
 	ie = handler->type;
 
@@ -22,10 +21,13 @@ int cw_out_generic_indexed_enum(struct cw_ElemHandler * handler, struct cw_ElemH
 	
 	for(i=0; e[i].name!=NULL; i++) {
 		sprintf(key,"%s/%s",handler->key,e[i].name);
-		result = cw_ktv_base_exists(params->conn->local_cfg,key);
+
+//printf("Her is the Key: %s - %s\n",key, );
+
+		result = cw_ktv_base_exists(params->local_cfg,key);
 		if (result==NULL)
 			continue;
-		start = params->conn->header_len(handler);
+		start = params->msgset->header_len(handler);
 		len = 0;
 		if (ie->idxpos==0)
 			len = 1;
@@ -33,20 +35,14 @@ int cw_out_generic_indexed_enum(struct cw_ElemHandler * handler, struct cw_ElemH
 		if (e[i].fun_out==NULL)
 			len += result->type->put(result,ob+start+len);
 		else
-			len += cw_ktv_write_struct(params->conn->local_cfg,
+			len += cw_ktv_write_struct(params->local_cfg,
 			NULL,e[i].type,key,ob+start+len);
 			
-/*		thandler.type=e[i].type;
-		thandler.key=key;
-		len += e->fun_out(&thandler,params,ob+start+len);
-*/
 		cw_set_byte(ob+start+ie->idxpos,e[i].value);
 		if (ie->idxpos==len)
 			len++;
 
-		ob += params->conn->write_header(handler,ob,len);
+		ob += params->msgset->write_header(handler,ob,len);
-		
-
 		
 	}
 

src/cw/cw_out_generic_struct.c

@@ -17,7 +17,7 @@ int cw_out_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandler
 	}
 	
 	search.key = (char*)handler->key;
-	result = mavl_get_first(params->conn->local_cfg,&search);
+	result = mavl_get_first(params->local_cfg,&search);
 	if (result == NULL ){
 		if (params->elemdata->mand)
 			cw_log(LOG_ERR,"Can't put mandatory message element %s, no data available",handler->name);
@@ -30,12 +30,12 @@ int cw_out_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHandler
 		return 0;
 	}
 
-	start = params->conn->header_len(handler);
+	start = params->msgset->header_len(handler);
 
-	len = cw_ktv_write_struct(params->conn->local_cfg,
+	len = cw_ktv_write_struct(params->local_cfg,
-		params->conn->default_cfg,
+		params->default_cfg,
 		handler->type,handler->key,dst+start);
 	
-	return params->conn->write_header(handler,dst,len);
+	return params->msgset->write_header(handler,dst,len);
 
 }

src/cw/cw_out_generic_with_index.c

@@ -18,18 +18,18 @@ int cw_out_generic_with_index(struct cw_ElemHandler * eh,
 	do {
 		sprintf(key,"%s.%d",eh->key,idx);
 		search.key=key;
-		result = mavl_get_first(params->conn->local_cfg,&search);
+		result = mavl_get_first(params->local_cfg,&search);
 		if (result==NULL)
 			break;
 		if (strncmp(result->key,key,strlen(key))!=0)
 			break;
 	
-		start = params->conn->header_len(eh);
+		start = params->msgset->header_len(eh);
 		len = cw_put_byte(ob+start,idx);
 		
 		len += result->type->put(result,ob+start+len);
 
-		ob += params->conn->write_header(eh,ob,len);
+		ob += params->msgset->write_header(eh,ob,len);
 		
 		idx++;
 		

src/cw/cw_out_idx_generic_struct.c

@@ -24,7 +24,7 @@ int cw_out_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHan
 		sprintf(key,handler->key,i);
 		search.key=key;
 		/*elem = mavl_get(params->conn->local_cfg, &search);*/
-		elem = mavl_get_first(params->conn->local_cfg,&search);
+		elem = mavl_get_first(params->local_cfg,&search);
 		if(elem != NULL){
 			printf("Elem key: %s\n",elem->key);
 		}
@@ -37,15 +37,13 @@ int cw_out_idx_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemHan
 
 		sprintf(key,handler->key,idx);
 
-		printf("Here we are '%s'! --> %d\n",key,idx);
-
 		len =0;
-		start = mdst + params->conn->header_len(handler);
+		start = mdst + params->msgset->header_len(handler);
 		
 		len += cw_put_byte(start+len,idx);
-		len += cw_ktv_write_struct(params->conn->local_cfg,NULL, handler->type,key,start+len);
+		len += cw_ktv_write_struct(params->local_cfg,NULL, handler->type,key,start+len);
 		
-		mdst += params->conn->write_header(handler,mdst,len);
+		mdst += params->msgset->write_header(handler,mdst,len);
 		
 	
 		i=idx+1;

src/cw/cw_out_radio_generic.c

@@ -20,11 +20,11 @@ int cw_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerP
 		idx++;
 	}
 */	
-	radios = cw_ktv_get_byte(params->conn->local_cfg,"wtp-descriptor/max-radios",0);
+	radios = cw_ktv_get_byte(params->local_cfg,"wtp-descriptor/max-radios",0);
 
 	for(i=0;i<radios;i++){
 		l = cw_write_radio_element(handler,params,i,dst+len);
-		cw_dbg_elem(DBG_ELEM_OUT,params->conn,params->msgdata->type,handler,dst,l);
+		cw_dbg_elem(DBG_ELEM_OUT,NULL,params->msgdata->type,handler,dst,l);
 		len+=l;
 	}
 	return len;

src/cw/cw_out_radio_generic_struct.c

@@ -14,19 +14,19 @@ int cw_out_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemH
 	cdst = dst;
 	
 
-	offset = params->conn->header_len(handler);
+	offset = params->msgset->header_len(handler);
 
 	i=-1;
 	while(1){
 		char basekey[CW_KTV_MAX_KEY_LEN];
 		cw_KTV_t * result;
 		
-		i = cw_ktv_idx_get_next(params->conn->local_cfg,"radio",i+1);
+		i = cw_ktv_idx_get_next(params->local_cfg,"radio",i+1);
 		if (i==-1)
 			break;
 		sprintf(basekey,"radio.%d/%s",i,handler->key);
 		
-		result = cw_ktv_base_exists(params->conn->local_cfg,basekey);
+		result = cw_ktv_base_exists(params->local_cfg,basekey);
 		if (result == NULL){
 			continue;
 		}
@@ -34,10 +34,10 @@ int cw_out_radio_generic_struct(struct cw_ElemHandler * handler, struct cw_ElemH
 		
 		l=0;
 		l+=cw_put_byte(cdst+offset+l,i);
-		l+= cw_ktv_write_struct(params->conn->local_cfg,NULL, handler->type,basekey,cdst+offset+l);
+		l+= cw_ktv_write_struct(params->local_cfg,NULL, handler->type,basekey,cdst+offset+l);
 		
 
-		cdst+=params->conn->write_header(handler,cdst,l);
+		cdst+=params->msgset->write_header(handler,cdst,l);
 	}
 	return cdst-dst;
 }
@@ -53,25 +53,27 @@ int cw_out_traverse0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParam
 	int len;
 	len = 0;
 
+printf("Next: %s\n", next);
+
 	sl = strchr(next,'/');
 	if (sl==NULL){
-				cw_KTV_t * result;
+		cw_KTV_t * result;
 		sprintf(key,"%s/%s",current,next);
-		result = cw_ktv_base_exists(params->conn->local_cfg,key);
+		result = cw_ktv_base_exists(params->local_cfg,key);
 		if (result != NULL){
 			int offset;
 			int i,l;
-			offset = params->conn->header_len(handler);
+			offset = params->msgset->header_len(handler);
 			printf("Yea! We can do it: %s\n",result->key);
 			for (i=0;i<stack[0];i++){
 				printf("I=%i\n",stack[i+1]);
 			}
-			l= cw_ktv_write_struct(params->conn->local_cfg,params->conn->default_cfg, 
+			l= cw_ktv_write_struct(params->local_cfg,params->default_cfg, 
 				handler->type,key,dst+offset);
 			
 			printf("Write struct len %i\n",l);
 			
-			l=params->conn->write_header(handler,dst,l);
+			l=params->msgset->write_header(handler,dst,l);
 			printf("header wr len %d\n",l);
 			if (handler->patch){
 				handler->patch(dst+offset,stack);
@@ -84,6 +86,9 @@ int cw_out_traverse0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParam
 	}
 	
 	strcpy(key,current);
+
+printf("current is %s\n", current);	
+
 	if (key[0!=0])
 		strcat(key,"/");
 	l = sl - next;
@@ -91,18 +96,19 @@ int cw_out_traverse0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParam
 	
 	
 	printf("Here we are %s\n",key);
-	cw_dbg_ktv_dump(params->conn->local_cfg,DBG_INFO,"start"," ", "end" );
+	cw_dbg_ktv_dump(params->local_cfg,DBG_INFO,"start"," ", "end" );
 	i=-1;
 	while(1){
 		char basekey[CW_KTV_MAX_KEY_LEN];
 		cw_KTV_t * result;
 		
-		i = cw_ktv_idx_get_next(params->conn->local_cfg,key,i+1);
+		i = cw_ktv_idx_get_next(params->local_cfg,key,i+1);
+		
 		if (i==-1)
 			break;
 		sprintf(basekey,"%s.%d",key,i);
 		printf("Our basekey is %s\n",basekey);
-		result = cw_ktv_base_exists(params->conn->local_cfg,basekey);
+		result = cw_ktv_base_exists(params->local_cfg,basekey);
 		if (result == NULL){
 			continue;
 		}
@@ -128,6 +134,8 @@ int cw_out_traverse(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams
 
 	current[0]=0;
 
+
+	
 	return cw_out_traverse0(handler,params,dst,-1,current,handler->key, stack);
 }
 

src/cw/cw_process_element.c

@@ -23,7 +23,7 @@ int cw_process_element(struct cw_ElemHandlerParams *params, int proto, int vendo
 	params->elem=NULL;
 	
 	/* try to retrieve a handler for this message element */
-	handler = cw_msgset_get_elemhandler(params->conn->msgset,proto, vendor, elem_id);
+	handler = cw_msgset_get_elemhandler(params->msgset,proto, vendor, elem_id);
 	if (!handler) {
 		
 		cw_dbg(DBG_ELEM_ERR, "Unrecognized message element: %d, ignoring", 
@@ -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);
@@ -65,13 +65,17 @@ int cw_process_element(struct cw_ElemHandlerParams *params, int proto, int vendo
 		return -1;
 	}
 
-	cw_dbg_elem(DBG_ELEM_IN, params->conn, params->msgdata->type, handler,
+	/*cw_dbg_elem(DBG_ELEM_IN, params->conn, params->msgdata->type, handler,
+				data,len);*/
+	cw_dbg_elem(DBG_ELEM_IN, NULL, params->msgdata->type, handler,
 				data,len);
 
 	if (handler->get == NULL){
 		cw_log(LOG_ERR,"No get method defined for %d %s",handler->id,handler->name);
 		return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
 	}
+
+
 	rc = handler->get(handler, params, data, len);
 
 

src/cw/cw_put_msg.c

@@ -28,7 +28,7 @@
 #include "log.h"
 #include "dbg.h"
 #include "msgset.h"
-
+#include "mavltypes.h"
 
 /**
  * Put a message to a buffer
@@ -65,7 +65,7 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout)
 		msg->preprocess(conn);
 	}
 
-	cw_dbg(DBG_MSG_ASSEMBLY,"*** Assenmbling message of type %d (%s) ***", 
+	cw_dbg(DBG_MSG_ASSEMBLY,"*** Assembling message of type %d (%s) ***", 
 			msg->type, msg->name);
 	
 	dst = msgptr+8;
@@ -77,7 +77,7 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout)
 		
 		data =  mlistelem_dataptr(elem);
 		handler = cw_msgset_get_elemhandler(conn->msgset,data->proto,data->vendor,data->id);
-	/*	printf("Elem: %d %d %d %s\n", data->proto, data->vendor, data->id, handler->name);*/
+printf("Elem: %d %d %d %s\n", data->proto, data->vendor, data->id, handler->name);
 		if (handler==NULL){
 			cw_log(LOG_ERR,"Can't put message element %d %d %d, no handler defined.",
 					data->proto,data->vendor,data->id);
@@ -94,7 +94,15 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout)
 			continue;
 		}
 
-		params.conn=conn;
+	/*	params.conn=conn;*/
+		params.local_cfg=conn->local_cfg;
+		params.remote_cfg=conn->remote_cfg;
+		params.default_cfg=conn->default_cfg;
+                params.global_cfg=conn->global_cfg;
+		params.msgset=conn->msgset;
+
+
+
 		params.elemdata = data;
 		params.elem=NULL;
 		params.msgdata=msg;
@@ -110,7 +118,7 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout)
 
 	/*	if(l>0)
 			cw_dbg_elem(DBG_ELEM_OUT,conn,type,handler,dst+len,l);
-		if (strlen(details)){
+	*	if (strlen(details)){
 			cw_dbg(DBG_ELEM_DETAIL,"  %s",params.debug_details);
 		}
 	*/	len += l;
@@ -125,6 +133,31 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout)
 		cw_set_msg_seqnum(msgptr,s);
 	}
 
+
+	{
+	printf ("----------------------------------- redecode -----------------------------\n");
+	uint8_t *elems_ptr;
+
+	int offset = cw_get_hdr_msg_offset(rawout);
+
+	uint8_t *msg_ptr = rawout + offset;
+	int elems_len = cw_get_msg_elems_len(msg_ptr);
+	elems_ptr = cw_get_msg_elems_ptr(msg_ptr);
+	mavl_t * cfg = cw_ktv_create();
+
+	struct cw_ElemHandlerParams params;
+
+	params.remote_cfg=cfg;
+	params.msgset=conn->msgset;
+	params.msgdata=msg;
+
+
+	cw_decode_elements( &params, elems_ptr,elems_len);
+
+	printf ("----------------------------------- end redecode -----------------------------\n");
+
+	}
+
 	return CAPWAP_RESULT_SUCCESS;
 
 

src/cw/cw_read_ac_descriptor.c

@@ -32,7 +32,7 @@ int cw_read_ac_descriptor(mavl_t store,
 			struct cw_DescriptorSubelemDef *allowed)
 {
 	
-	cw_ktv_read_struct(params->conn->remote_cfg,acstatus,eh->key,data,len);
+	cw_ktv_read_struct(params->remote_cfg,acstatus,eh->key,data,len);
 
 	if (!allowed)
 		allowed=allowed_default;

src/cw/cw_read_radio_generic.c

@@ -21,7 +21,7 @@ int cw_in_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerPa
 	radio=cw_get_byte(elem_data);
 	sprintf(key,"radio.%d/%s",radio,handler->key);
 	
-	result = cw_ktv_add(params->conn->remote_cfg, key, 
+	result = cw_ktv_add(params->remote_cfg, key, 
 				handler->type, NULL, elem_data+1,elem_len-1);
 	
 	params->elem=result;

src/cw/cw_read_wtp_descriptor.c

@@ -29,7 +29,7 @@ int cw_read_wtp_descriptor(mavl_t cfg, struct conn *conn,
 	/* Get number of encryption elements */
 	ncrypt = cw_get_byte(data + 2);
 	if (ncrypt == 0) {
-		if (conn->strict_capwap) {
+		if (0 /*conn->strict_capwap*/) {
 			cw_dbg(DBG_ELEM_ERR,
 			       "Bad WTP Descriptor, number of encryption elements is 0.");
 			return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;

src/cw/cw_type_bwstr.c

@@ -0,0 +1,140 @@
+/*
+    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 <stdio.h>
+
+#include "format.h"
+#include "cw.h"
+#include "ktv.h"
+
+
+/*typedef uint16_t* bwstr_type;*/
+
+
+static uint16_t * bwstr_create(const uint8_t *data, uint16_t len)
+{
+	uint16_t * str = malloc(2+len*sizeof(uint16_t));
+	if (!str)	
+		return 0;
+	*((uint16_t*)str)=len;
+	memcpy(str+2,data,len*2);
+	return str;
+}
+
+
+
+static void del ( struct cw_KTV * data )
+{
+	free ( data->val.ptr );
+}
+
+static struct cw_KTV *get ( struct cw_KTV * data, const uint8_t * src, int len )
+{
+	uint16_t * s;
+	s = bwstr_create ( src, len );
+	
+	if ( !s )
+		return NULL;
+
+	data->type = &cw_type_bwstr;
+	data->val.ptr = s;
+	return data;
+}
+
+static int put ( const struct cw_KTV *data, uint8_t * dst )
+{
+	uint16_t len;
+	len = bstr16_len(data->val.ptr);
+
+	return lw_put_data ( dst, data->val.ptr+2,len*2 );
+}
+
+static int to_str ( const struct cw_KTV *data, char *dst, int max_len )
+{
+	char *d;
+	uint16_t *s;
+	const char * komma="";
+	uint16_t i;
+       
+	s = (uint16_t*)data->val.ptr;
+	d = dst;
+
+	for (i=0;i<s[0];i++){
+		d += sprintf( d, "%s%d",komma,s[i+1]);
+		komma=",";
+	}
+
+	return d - dst;
+}
+
+static struct cw_KTV *from_str ( struct cw_KTV * data, const char *src )
+{
+	uint8_t * s;
+	s = bstr16_create_from_str(src);
+	
+	if ( !s )
+		return NULL;
+
+	data->type = &cw_type_bstr16;
+	data->val.ptr = s;
+	return data;
+	
+}
+
+static int len (cw_KTV_t * data ){
+	return bstr16_len(data->val.ptr);
+}
+
+static void * data(cw_KTV_t * data)
+{
+	return bstr16_data(data->val.ptr);
+}
+
+static const char * get_type_name(cw_KTV_t *data)
+{
+	return CW_TYPE_BSTR16->name;
+}
+
+static int cast(cw_KTV_t * data)
+{
+	if (strcmp(data->type->name,CW_TYPE_BSTR16->name)==0)
+		return 1;
+	if (strcmp(data->type->name,CW_TYPE_STR->name)==0){
+		char *src = data->val.ptr;
+		CW_TYPE_BSTR16->from_str(data,src);
+		free(src);
+		return 1;
+	}
+	return 0;
+}
+
+
+const struct cw_Type cw_type_bwstr = {
+	"Bwstr",	/* name */
+	del,		/* del */
+	put,		/* put */
+	get,		/* get */
+	to_str,		/* to_str */
+	from_str,	/* from_str */
+	len,		/* len */
+	data,		/* data */
+	get_type_name,	/* get_type_name */
+	cast		/* cast */
+};
+
+

src/cw/cw_type_bwstr.h

@@ -0,0 +1,123 @@
+/*
+    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 <stdio.h>
+
+#include "format.h"
+#include "cw.h"
+#include "ktv.h"
+
+
+static void del ( struct cw_KTV * data )
+{
+	free ( data->val.ptr );
+}
+
+static struct cw_KTV *get ( struct cw_KTV * data, const uint8_t * src, int len )
+{
+	uint8_t * s;
+	s = bstr16_create ( src, len );
+	
+	if ( !s )
+		return NULL;
+
+	data->type = &cw_type_bstr16;
+	data->val.ptr = s;
+	return data;
+}
+
+static int put ( const struct cw_KTV *data, uint8_t * dst )
+{
+	return cw_put_bstr16 ( dst, data->val.ptr );
+}
+
+static int to_str ( const struct cw_KTV *data, char *dst, int max_len )
+{
+	char *d;
+	d = dst;
+	
+	if ( format_is_utf8 ( bstr16_data ( data->val.ptr ), bstr16_len ( data->val.ptr ) ) ) {
+		d += sprintf ( d, "%.*s", bstr16_len ( data->val.ptr ),
+		               bstr16_data ( data->val.ptr ) );
+		               
+	} else {
+		d += sprintf ( d, ".x" );
+		d += format_hex ( d, bstr16_data ( data->val.ptr ), bstr16_len ( data->val.ptr ) );
+	}
+	
+	return d - dst;
+}
+
+static struct cw_KTV *from_str ( struct cw_KTV * data, const char *src )
+{
+	uint8_t * s;
+	s = bstr16_create_from_str(src);
+	
+	if ( !s )
+		return NULL;
+
+	data->type = &cw_type_bstr16;
+	data->val.ptr = s;
+	return data;
+	
+}
+
+static int len (cw_KTV_t * data ){
+	return bstr16_len(data->val.ptr);
+}
+
+static void * data(cw_KTV_t * data)
+{
+	return bstr16_data(data->val.ptr);
+}
+
+static const char * get_type_name(cw_KTV_t *data)
+{
+	return CW_TYPE_BSTR16->name;
+}
+
+static int cast(cw_KTV_t * data)
+{
+	return 0;
+
+	if (strcmp(data->type->name,CW_TYPE_BSTR16->name)==0)
+		return 1;
+	if (strcmp(data->type->name,CW_TYPE_STR->name)==0){
+		char *src = data->val.ptr;
+		CW_TYPE_BSTR16->from_str(data,src);
+		free(src);
+		return 1;
+	}
+	return 0;
+}
+
+
+const struct cw_Type cw_type_bwstr = {
+	"BWstr",	/* name */
+	del,		/* del */
+	put,		/* put */
+	get,		/* get */
+	to_str,		/* to_str */
+	from_str,	/* from_str */
+	len,		/* len */
+	data,		/* data */
+	get_type_name,	/* get_type_name */
+	cast		/* cast */
+};
+
+

src/cw/cw_write_header.c

@@ -1,4 +1,4 @@
-
+#include "conn.h"
 #include "msgset.h"
 #include "cw.h"
 
@@ -10,3 +10,11 @@ int cw_write_header(struct cw_ElemHandler * handler, uint8_t * dst, int len)
 	return  len + cw_put_elem_hdr(dst, handler->id, len);
 }
 
+
+
+int cw_header_len(struct cw_ElemHandler * handler)
+{
+	return handler->vendor ? 10 : 4;
+}
+
+

src/cw/cw_write_radio_element.c

@@ -10,15 +10,15 @@ int cw_write_radio_element(struct cw_ElemHandler * handler, struct cw_ElemHandle
 	uint8_t * d;
 	
 	len =0;
-	
 	sprintf(key,"radio.%d/%s",idx,handler->key);
 	
-	/*printf("Looking for key: %s\n",key);*/
+	printf("Looking for readio key: %s\n",key);
 	
 	search.key=key;
-	elem = mavl_get(params->conn->local_cfg, &search);
+	elem = mavl_get(params->local_cfg, &search);
 	
 	if (elem==NULL){
+		printf("Nothing found\n");
 		return 0;
 	}
 	
@@ -27,14 +27,17 @@ int cw_write_radio_element(struct cw_ElemHandler * handler, struct cw_ElemHandle
 	d = handler->vendor ? dst+10 : dst+4;
 	
 	/* put radio id */
+
+	printf("Putting put byte index: %d\n",idx);
+
 	len += cw_put_byte(d+len,idx);
 	
 	len += ((const cw_Type_t*)(handler->type))->put(elem,d+len);
 /*	l = len + cw_put_elem_hdr(dst, handler->id, len);*/
 	
-/*	if (handler->vendor)
+	if (handler->vendor)
 		return len + cw_put_elem_vendor_hdr(dst, handler->vendor, handler->id, len);
-*/
+
 	return  len + cw_put_elem_hdr(dst, handler->id, len);
 }
 

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_bio.c

@@ -41,7 +41,7 @@ int dtls_bio_read(struct conn *conn, char *out, int maxlen)
 {
 	int ret;
 	if (conn->dtls_buffer_len == 0) {
-		int len = conn->recv_packet(conn, conn->dtls_buffer, 2048);
+		int len = conn->recv_packet(conn, conn->dtls_buffer, 4096);
 		if (len < 4)
 			return 0;
 		conn->dtls_buffer_len = len - 4;
@@ -77,7 +77,7 @@ int dtls_bio_read(struct conn *conn, char *out, int maxlen)
  */
 int dtls_bio_write(struct conn *conn, const char *data, int len)
 {
-	uint8_t buffer[2048];
+	uint8_t buffer[4096];
 	int rc;
 	*((uint32_t *) buffer) = htonl(1 << 24);
 	memcpy(buffer + 4, data, len);

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,6 +319,16 @@ 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){
@@ -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*/
 
 
 
@@ -375,17 +384,16 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
 
 
 
-
 /*//	SSL_CTX_set_session_cache_mode(d->ctx, SSL_SESS_CACHE_BOTH);*/
 	SSL_CTX_set_options(d->ctx, SSL_OP_NO_SSLv2 |SSL_OP_NO_SSLv3 );
 /*//	SSL_CTX_set_generate_session_id(d->ctx,generate_session_id);*/
 
 
 	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

@@ -38,7 +38,7 @@ struct dtls_openssl_data{
 	SSL_CTX * ctx;
 	SSL * ssl;
 	BIO * bio;
-	uint8_t buffer[2048];
+	uint8_t buffer[4096];
 	int len;
 	int pos;
 };
@@ -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,
@@ -49,10 +34,22 @@ dtls_openssl_connect(struct conn *conn)
 	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"
 
 
@@ -145,6 +147,7 @@ extern const struct cw_Type cw_type_byte;
 extern const struct cw_Type cw_type_word;
 extern const struct cw_Type cw_type_dword;
 extern const struct cw_Type cw_type_bstr16;
+extern const struct cw_Type cw_type_bwstr;
 extern const struct cw_Type cw_type_str;
 extern const struct cw_Type cw_type_ipaddress;
 extern const struct cw_Type cw_type_sysptr;
@@ -154,6 +157,7 @@ extern const struct cw_Type cw_type_bool;
 #define CW_TYPE_WORD (&cw_type_word)
 #define CW_TYPE_DWORD (&cw_type_dword)
 #define CW_TYPE_BSTR16 (&cw_type_bstr16)
+#define CW_TYPE_BWSTR (&cw_type_bwstr)
 #define CW_TYPE_IPADDRESS (&cw_type_ipaddress)
 #define CW_TYPE_SYSPTR (&cw_type_sysptr)
 #define CW_TYPE_STR (&cw_type_str)

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_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_insert_ptr.c

@@ -0,0 +1,10 @@
+#include "mavl.h"
+#include "mavltypes.h"
+
+void *mavl_insert_ptr(mavl_t tree, const void *ptr){
+	void * result;
+	result = mavl_insert(tree,&ptr,NULL);
+	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/mavltypes.h

@@ -0,0 +1,34 @@
+
+/**
+ * MAVL AVL Tree type
+ */
+typedef struct mavl * mavl_t;
+typedef struct mavliter mavliter_t;
+
+void * mavl_get_ptr ( mavl_t tree, void * search );
+
+
+/**
+ * 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 *s1, const void *s2);
+#define mavl_create_conststr() mavl_create_ptr(mavl_cmpstr,NULL)
+
+#define mavl_add_str(tree,str) mavl_insert_ptr(tree,str)
+#define mavl_get_str(tree,search) ((char *)(mavl_get_ptr(tree,search)))
+void * mavl_insert_ptr ( mavl_t tree, const void *ptr );
+void *mavl_replace(struct mavl *t,const void  *data, int * replaced);
+
+void * mavl_get_ptr(mavl_t tree, void * search);
+void * mavliter_get_ptr(mavliter_t *i);
+void mavl_merge(mavl_t target, mavl_t source);
+
+void mavl_freeptr(void *ptr);
+#define mavliter_get_str(iter) ((char*)(mavliter_get_ptr(iter)));
+#define mavl_get_str(tree,search) ((char *)(mavl_get_ptr(tree,search)))

src/cw/mlist_get.c

@@ -5,7 +5,7 @@ struct mlistelem * mlist_get(mlist_t list, const void *data){
 	mlist_foreach(elem,list){
 		void *tdata = mlistelem_dataptr(elem);
 		if (list->cmp(tdata,data)==0){
-			return tdata;
+			return elem;
 		}
 	}
 	return NULL;

src/cw/mod.c

@@ -105,7 +105,7 @@ struct cw_MsgSet *cw_mod_get_msg_set(struct conn *conn,
 	struct cw_MsgSet *set;
 
 	if (!msgset_cache) {
-		msgset_cache = mavl_create(cmp, NULL, 1312);
+		msgset_cache = mavl_create(cmp, NULL, sizeof(struct cache_item*));
 		if (!msgset_cache) {
 			cw_log(LOG_ERR, "Can't initialize msgset cache: %s",
 			       strerror(errno));
@@ -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;
 }
 
@@ -213,7 +213,7 @@ struct cw_Mod *cw_mod_load(const char *mod_name, mavl_t global_cfg, int role)
 
 	/* if modlist is not initialized, initialize ... */
 	if (mods_loaded == NULL) {
-		mods_loaded = mavl_create(mod_cmp_mavl, NULL, 1312);
+		mods_loaded = mavl_create(mod_cmp_mavl, NULL, sizeof(struct cw_Mod*));
 		if (mods_loaded == NULL) {
 			cw_log(LOG_ERROR, "Can't init modlist, no memory");
 			return NULL;
@@ -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,13 +267,15 @@ 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;
 	}
+
 	cw_dbg(DBG_MOD, "MOD: %s sucessfull loaded, calling init now.", filename);
 	mod->init(mod, global_cfg, role);
+	
       errX:
 	free(filename);
 	return mod;