chaned

FossilOrigin-Name: 7eb533db72ded8c6cc1aadf337a3ab527f07157a15a3f4e9fd5f1905885e7e27

LICENSE

@@ -1,674 +1,26 @@
-GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-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>.
+/*
+ * Copyright 2013,2020, The PLANIX Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */

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/Config.default.mak

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

src/ac/Makefile

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

src/cw/conn_send_msg.c

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

src/cw/cw.h

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

src/cw/cw_inline.c

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

src/cw/send.c

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

src/mod/capwap/capwap_actions_ac.c

@@ -616,6 +616,25 @@ static struct cw_MsgDef messages[] = {
 		discovery_response_elements
 	},
 
+
+	{
+		"Primary Discovery Request",
+		CAPWAP_MSG_PRIMARY_DISCOVERY_REQUEST,
+		CW_ROLE_AC,
+		discovery_request_states,
+		discovery_request_elements
+	},
+	
+	{
+		"Primary Discovery Response",
+		CAPWAP_MSG_PRIMARY_DISCOVERY_RESPONSE,
+		CW_ROLE_WTP,
+		discovery_response_states,
+		discovery_response_elements
+	},
+
+
+
 	{
 		"Join Request",
 		CAPWAP_MSG_JOIN_REQUEST,

src/mod/capwap/capwap_in_wtp_board_data.c

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

src/mod/capwap/capwap_out_wtp_board_data.c

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

src/mod/cisco/cisco_actions_ac.c

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

src/wtp/Makefile

@@ -4,6 +4,8 @@
 #-include ../Config.local.mak
 #-include ../WtpConfig.local.mak
 #include ../Macros.mak
+include ../Config.default.mak
+-include ../Config.mak
 
 
 INCL_DIRS=-I../
@@ -15,7 +17,7 @@ EXENAME		:= ./wtp
 
 LIBS		:= -lcw -lnettle
 #STATICLIBS	:= $(LIBDIR)/$(ARCH)/libcw.a
-LDFLAGS		+= -L$(LIBARCHDIR)
+LDFLAGS		+= -L$(LIBARCHDIR) -L/usr/local/lib
 
 #ifeq ($(SSL_LIBRARY),GNUTLS)
 #CFLAGS+=-DWITH_GNUTLS
@@ -58,8 +60,8 @@ all: $(ALL)
 	@$(CC) $(INCL_DIRS) -c $(CFLAGS) $< -o $@
 
 $(EXENAME): $(OBJS)
-	echo "  $(LD) $(EXENAME)"
-	$(LD) $(LDFLAGS) -o $(EXENAME) $(OBJS) $(LIBS) $(STATICLIBS)
+	echo "  $(CC) $(EXENAME)"
+	$(CC) $(LDFLAGS) -o $(EXENAME) $(OBJS) $(LIBS) $(STATICLIBS)
 
 
 clean: 

src/wtp/cisco.ktv

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

wtp.project

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