Merge branch 'master' of D:/srivatsp/projects/ostinato/master
This commit is contained in:
commit
c3adc74351
11
.travis.yml
11
.travis.yml
@ -1,5 +1,5 @@
|
||||
language: cpp
|
||||
osx_image: xcode8.2
|
||||
osx_image: xcode7.3
|
||||
|
||||
os:
|
||||
- linux
|
||||
@ -15,7 +15,14 @@ matrix:
|
||||
compiler: gcc
|
||||
|
||||
before_install:
|
||||
- "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew tap cartr/qt4 && brew tap-pin cartr/qt4 && brew install qt@4 && brew install protobuf && ls -lR /usr/local/include; fi"
|
||||
- "if [ $TRAVIS_OS_NAME = 'osx' ]; then \
|
||||
brew update && \
|
||||
brew tap cartr/qt4 && \
|
||||
brew tap-pin cartr/qt4 && \
|
||||
brew install qt@4 && \
|
||||
brew install protobuf && \
|
||||
ls -lR /usr/local/include; \
|
||||
fi"
|
||||
|
||||
addons:
|
||||
apt:
|
||||
|
@ -1,674 +0,0 @@
|
||||
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:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
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>.
|
@ -1,9 +0,0 @@
|
||||
===============
|
||||
python-ostinato
|
||||
===============
|
||||
|
||||
python-ostinato provides python bindings for Ostinato.
|
||||
|
||||
Ostinato is a network packet/traffic generator and analyzer. It aims to be "Wireshark in Reverse" and become complementary to Wireshark.
|
||||
|
||||
Documentation is available in the wiki at http://ostinato.org
|
@ -1,28 +0,0 @@
|
||||
# Copyright (C) 2014 Srivats P.
|
||||
#
|
||||
# This file is part of "Ostinato"
|
||||
#
|
||||
# This 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/>
|
||||
|
||||
import json
|
||||
import logging
|
||||
from os.path import dirname
|
||||
|
||||
with open(dirname(__file__) + '/pkg_info.json') as f:
|
||||
_info = json.load(f)
|
||||
|
||||
__version__ = _info['version']
|
||||
__revision__ = _info['revision']
|
||||
|
||||
__log__ = logging.getLogger(__name__)
|
@ -1,4 +0,0 @@
|
||||
TEMPLATE = lib
|
||||
CONFIG += pkg_info
|
||||
|
||||
include(../version.pri)
|
100
binding/core.py
100
binding/core.py
@ -1,100 +0,0 @@
|
||||
# Copyright (C) 2014 Srivats P.
|
||||
#
|
||||
# This file is part of "Ostinato"
|
||||
#
|
||||
# This 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/>
|
||||
"""
|
||||
This is the core module for the Ostinato Python API.
|
||||
All drone configuration is done by creating an instance of the
|
||||
`DroneProxy` class and calling its various methods subsequently.
|
||||
"""
|
||||
|
||||
import os
|
||||
from rpc import OstinatoRpcChannel, OstinatoRpcController, RpcError
|
||||
import protocols.protocol_pb2 as ost_pb
|
||||
import protocols.emulproto_pb2 as emul
|
||||
from __init__ import __version__
|
||||
|
||||
class DroneProxy(object):
|
||||
"""
|
||||
DroneProxy acts as a proxy to a Drone instance. A method invoked on this
|
||||
class will be trigerred on the actual Drone instance being proxied
|
||||
"""
|
||||
|
||||
def __init__(self, host_name, port_number=7878):
|
||||
"""
|
||||
Create a DroneProxy object as a proxy to the Drone instance
|
||||
running at the specified host and port
|
||||
"""
|
||||
self.host = host_name
|
||||
self.port = port_number
|
||||
self.channel = OstinatoRpcChannel()
|
||||
self.stub = ost_pb.OstService_Stub(self.channel)
|
||||
self.void = ost_pb.Void()
|
||||
|
||||
for method in self.stub.GetDescriptor().methods:
|
||||
fn = lambda request=self.void, method_name=method.name: \
|
||||
self.callRpcMethod(method_name, request)
|
||||
self.__dict__[method.name] = fn
|
||||
self.__dict__[method.name].__doc__ = 'This is a protobuf API'
|
||||
|
||||
def hostName(self):
|
||||
"""
|
||||
Returns the hostname of the Drone which is being proxied by
|
||||
this DroneProxy object
|
||||
"""
|
||||
return self.host
|
||||
|
||||
def portNumber(self):
|
||||
"""
|
||||
Returns the TCP port number of the Drone which is being proxied by
|
||||
this DroneProxy object
|
||||
"""
|
||||
return self.port
|
||||
|
||||
def connect(self):
|
||||
"""
|
||||
Connect to the Drone instance
|
||||
"""
|
||||
self.channel.connect(self.host, self.port)
|
||||
ver = ost_pb.VersionInfo()
|
||||
ver.client_name = 'python-ostinato'
|
||||
ver.version = __version__
|
||||
compat = self.checkVersion(ver)
|
||||
if compat.result == ost_pb.VersionCompatibility.kIncompatible:
|
||||
raise RpcError('incompatible version %s (%s)' %
|
||||
(ver.version, compat.notes))
|
||||
|
||||
def disconnect(self):
|
||||
"""
|
||||
Disconnect from the Drone instance
|
||||
"""
|
||||
self.channel.disconnect()
|
||||
|
||||
def callRpcMethod(self, method_name, request):
|
||||
controller = OstinatoRpcController()
|
||||
ost_pb.OstService_Stub.__dict__[method_name](
|
||||
self.stub, controller, request, None)
|
||||
return controller.response
|
||||
|
||||
def saveCaptureBuffer(self, buffer, file_name):
|
||||
"""
|
||||
Save the capture buffer in a PCAP file
|
||||
"""
|
||||
f= open(file_name, 'wb')
|
||||
f.write(buffer)
|
||||
f.flush()
|
||||
os.fsync(f.fileno())
|
||||
f.close()
|
||||
|
@ -1,188 +0,0 @@
|
||||
#! /usr/bin/env python
|
||||
|
||||
# standard modules
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
|
||||
# ostinato modules
|
||||
# (user scripts using the installed package should prepend ostinato. i.e
|
||||
# ostinato.core and ostinato.protocols)
|
||||
from core import ost_pb, DroneProxy
|
||||
from protocols.mac_pb2 import mac
|
||||
from protocols.ip4_pb2 import ip4, Ip4
|
||||
|
||||
# initialize defaults
|
||||
use_defaults = False
|
||||
host_name = '127.0.0.1'
|
||||
tx_port_number = 0
|
||||
rx_port_number = 0
|
||||
|
||||
# setup logging
|
||||
log = logging.getLogger(__name__)
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
# command-line option/arg processing
|
||||
if len(sys.argv) > 1:
|
||||
if sys.argv[1] in ('-d', '--use-defaults'):
|
||||
use_defaults = True
|
||||
if sys.argv[1] in ('-h', '--help'):
|
||||
print('%s [OPTION]...' % (sys.argv[0]))
|
||||
print('Options:')
|
||||
print(' -d --use-defaults run using default values')
|
||||
print(' -h --help show this help')
|
||||
sys.exit(0)
|
||||
|
||||
print('')
|
||||
print('This example expects the following topology -')
|
||||
print('')
|
||||
print(' +-------+ +-------+')
|
||||
print(' | |Tx--->----| |')
|
||||
print(' | Drone | | DUT |')
|
||||
print(' | |Rx---<----| |')
|
||||
print(' +-------+ +-------+')
|
||||
print('')
|
||||
print('Drone has 2 ports connected to DUT. Packets sent on the Tx port')
|
||||
print('are expected to be received back on the Rx port')
|
||||
print('')
|
||||
print('An easy way to simulate the above topology is to select the loopback')
|
||||
print('port as both Tx and Rx ports')
|
||||
print('')
|
||||
|
||||
if not use_defaults:
|
||||
s = raw_input('Drone\'s Hostname/IP [%s]: ' % (host_name))
|
||||
host_name = s or host_name
|
||||
|
||||
drone = DroneProxy(host_name)
|
||||
|
||||
try:
|
||||
# connect to drone
|
||||
log.info('connecting to drone(%s:%d)'
|
||||
% (drone.hostName(), drone.portNumber()))
|
||||
drone.connect()
|
||||
|
||||
# retreive port id list
|
||||
log.info('retreiving port list')
|
||||
port_id_list = drone.getPortIdList()
|
||||
|
||||
# retreive port config list
|
||||
log.info('retreiving port config for all ports')
|
||||
port_config_list = drone.getPortConfig(port_id_list)
|
||||
|
||||
if len(port_config_list.port) == 0:
|
||||
log.warning('drone has no ports!')
|
||||
sys.exit(1)
|
||||
|
||||
# print port list and get tx/rx port id
|
||||
print('Port List')
|
||||
print('---------')
|
||||
for port in port_config_list.port:
|
||||
print('%d.%s (%s)' % (port.port_id.id, port.name, port.description))
|
||||
# use a loopback port as default tx/rx port
|
||||
if ('lo' in port.name or 'loopback' in port.description.lower()):
|
||||
tx_port_number = port.port_id.id
|
||||
rx_port_number = port.port_id.id
|
||||
|
||||
if not use_defaults:
|
||||
p = raw_input('Tx Port Id [%d]: ' % (tx_port_number))
|
||||
if p:
|
||||
tx_port_number = int(p)
|
||||
|
||||
p = raw_input('Rx Port Id [%d]: ' % (rx_port_number))
|
||||
if p:
|
||||
rx_port_number = int(p)
|
||||
|
||||
tx_port = ost_pb.PortIdList()
|
||||
tx_port.port_id.add().id = tx_port_number;
|
||||
|
||||
rx_port = ost_pb.PortIdList()
|
||||
rx_port.port_id.add().id = rx_port_number;
|
||||
|
||||
# add a stream
|
||||
stream_id = ost_pb.StreamIdList()
|
||||
stream_id.port_id.CopyFrom(tx_port.port_id[0])
|
||||
stream_id.stream_id.add().id = 1
|
||||
log.info('adding tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.addStream(stream_id)
|
||||
|
||||
# configure the stream
|
||||
stream_cfg = ost_pb.StreamConfigList()
|
||||
stream_cfg.port_id.CopyFrom(tx_port.port_id[0])
|
||||
s = stream_cfg.stream.add()
|
||||
s.stream_id.id = stream_id.stream_id[0].id
|
||||
s.core.is_enabled = True
|
||||
s.control.num_packets = 5
|
||||
|
||||
# setup stream protocols as mac:eth2:ip4:udp:payload
|
||||
p = s.protocol.add()
|
||||
p.protocol_id.id = ost_pb.Protocol.kMacFieldNumber
|
||||
p.Extensions[mac].dst_mac = 0x001122334455
|
||||
p.Extensions[mac].src_mac = 0x00aabbccddee
|
||||
|
||||
p = s.protocol.add()
|
||||
p.protocol_id.id = ost_pb.Protocol.kEth2FieldNumber
|
||||
|
||||
p = s.protocol.add()
|
||||
p.protocol_id.id = ost_pb.Protocol.kIp4FieldNumber
|
||||
# reduce typing by creating a shorter reference to p.Extensions[ip4]
|
||||
ip = p.Extensions[ip4]
|
||||
ip.src_ip = 0x01020304
|
||||
ip.dst_ip = 0x05060708
|
||||
ip.dst_ip_mode = Ip4.e_im_inc_host
|
||||
|
||||
s.protocol.add().protocol_id.id = ost_pb.Protocol.kUdpFieldNumber
|
||||
s.protocol.add().protocol_id.id = ost_pb.Protocol.kPayloadFieldNumber
|
||||
|
||||
log.info('configuring tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.modifyStream(stream_cfg)
|
||||
|
||||
# clear tx/rx stats
|
||||
log.info('clearing tx/rx stats')
|
||||
drone.clearStats(tx_port)
|
||||
drone.clearStats(rx_port)
|
||||
|
||||
# start capture and transmit
|
||||
log.info('starting capture')
|
||||
drone.startCapture(rx_port)
|
||||
log.info('starting transmit')
|
||||
drone.startTransmit(tx_port)
|
||||
|
||||
# wait for transmit to finish
|
||||
log.info('waiting for transmit to finish ...')
|
||||
time.sleep(7)
|
||||
|
||||
# stop transmit and capture
|
||||
log.info('stopping transmit')
|
||||
drone.stopTransmit(tx_port)
|
||||
log.info('stopping capture')
|
||||
drone.stopCapture(rx_port)
|
||||
|
||||
# get tx/rx stats
|
||||
log.info('retreiving stats')
|
||||
tx_stats = drone.getStats(tx_port)
|
||||
rx_stats = drone.getStats(rx_port)
|
||||
|
||||
#log.info('--> (tx_stats)' + tx_stats.__str__())
|
||||
#log.info('--> (rx_stats)' + rx_stats.__str__())
|
||||
log.info('tx pkts = %d, rx pkts = %d' %
|
||||
(tx_stats.port_stats[0].tx_pkts, rx_stats.port_stats[0].rx_pkts))
|
||||
|
||||
# retrieve and dump received packets
|
||||
log.info('getting Rx capture buffer')
|
||||
buff = drone.getCaptureBuffer(rx_port.port_id[0])
|
||||
drone.saveCaptureBuffer(buff, 'capture.pcap')
|
||||
log.info('dumping Rx capture buffer')
|
||||
os.system('tshark -r capture.pcap')
|
||||
os.remove('capture.pcap')
|
||||
|
||||
# delete streams
|
||||
log.info('deleting tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.deleteStream(stream_id)
|
||||
|
||||
# bye for now
|
||||
drone.disconnect()
|
||||
|
||||
except Exception as ex:
|
||||
log.exception(ex)
|
||||
sys.exit(1)
|
@ -1,17 +0,0 @@
|
||||
# Copyright (C) 2014 Srivats P.
|
||||
#
|
||||
# This file is part of "Ostinato"
|
||||
#
|
||||
# This 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/>
|
||||
|
169
binding/rpc.py
169
binding/rpc.py
@ -1,169 +0,0 @@
|
||||
# Copyright (C) 2014 Srivats P.
|
||||
#
|
||||
# This file is part of "Ostinato"
|
||||
#
|
||||
# This 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/>
|
||||
|
||||
from google.protobuf.message import EncodeError, DecodeError
|
||||
from google.protobuf.service import RpcChannel
|
||||
from google.protobuf.service import RpcController
|
||||
import logging
|
||||
import socket
|
||||
import struct
|
||||
import sys
|
||||
|
||||
class PeerClosedConnError(Exception):
|
||||
def __init__(self, msg):
|
||||
self.msg = msg
|
||||
def __str__(self):
|
||||
return self.msg
|
||||
|
||||
class RpcError(Exception):
|
||||
def __init__(self, msg):
|
||||
self.msg = msg
|
||||
def __str__(self):
|
||||
return self.msg
|
||||
|
||||
class RpcMismatchError(Exception):
|
||||
def __init__(self, msg, received, expected):
|
||||
self.msg = msg
|
||||
self.received = received
|
||||
self.expected = expected
|
||||
def __str__(self):
|
||||
return '%s - Expected method %d, Received method %d' % (
|
||||
self.msg, self.expected, self.received)
|
||||
|
||||
class OstinatoRpcController(RpcController):
|
||||
def __init__(self):
|
||||
super(OstinatoRpcController, self).__init__()
|
||||
|
||||
class OstinatoRpcChannel(RpcChannel):
|
||||
def __init__(self):
|
||||
self.log = logging.getLogger(__name__)
|
||||
self.log.debug('opening socket')
|
||||
|
||||
def connect(self, host, port):
|
||||
self.peer = '%s:%d' % (host, port)
|
||||
self.log.debug('connecting to %s', self.peer)
|
||||
try:
|
||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.sock.connect((host, port))
|
||||
except socket.error as e:
|
||||
error = 'ERROR: Unable to connect to Drone %s (%s)' % (
|
||||
self.peer, str(e))
|
||||
print(error)
|
||||
raise
|
||||
|
||||
def disconnect(self):
|
||||
self.log.debug('closing socket')
|
||||
self.sock.close()
|
||||
|
||||
def CallMethod(self, method, controller, request, response_class, done):
|
||||
MSG_HDR_SIZE = 8
|
||||
MSG_TYPE_REQUEST = 1
|
||||
MSG_TYPE_RESPONSE = 2
|
||||
MSG_TYPE_BLOB = 3
|
||||
MSG_TYPE_ERROR = 4
|
||||
|
||||
error = ''
|
||||
try:
|
||||
self.log.info('invoking RPC %s(%s): %s', method.name,
|
||||
type(request).__name__, response_class.__name__)
|
||||
if not request.IsInitialized():
|
||||
raise RpcError('missing required fields in request')
|
||||
self.log.debug('serializing request arg %s', request)
|
||||
req = request.SerializeToString()
|
||||
hdr = struct.pack('>HHI', MSG_TYPE_REQUEST, method.index, len(req))
|
||||
self.log.debug('req.hdr = %r', hdr)
|
||||
self.sock.sendall(hdr + req)
|
||||
|
||||
# receive and parse header
|
||||
self.log.debug('receiving response hdr')
|
||||
hdr = ''
|
||||
while len(hdr) < MSG_HDR_SIZE:
|
||||
chunk = self.sock.recv(MSG_HDR_SIZE - len(hdr))
|
||||
if chunk == '':
|
||||
raise PeerClosedConnError('connection closed by peer')
|
||||
hdr = hdr + chunk
|
||||
|
||||
(msg_type, method_index, resp_len) = struct.unpack('>HHI', hdr)
|
||||
self.log.debug('resp hdr: type = %d, method = %d, len = %d',
|
||||
msg_type, method_index, resp_len)
|
||||
|
||||
# receive and parse the actual response message
|
||||
self.log.debug('receiving response data')
|
||||
resp = ''
|
||||
while len(resp) < resp_len:
|
||||
chunk = self.sock.recv(resp_len - len(resp))
|
||||
if chunk == '':
|
||||
raise PeerClosedConnError('connection closed by peer')
|
||||
resp = resp + chunk
|
||||
|
||||
# verify response method is same as the one requested
|
||||
if method_index != method.index:
|
||||
raise RpcMismatchError('RPC mismatch',
|
||||
expected = method.index, received = method_index)
|
||||
|
||||
if msg_type == MSG_TYPE_RESPONSE:
|
||||
response = response_class()
|
||||
response.ParseFromString(resp)
|
||||
self.log.debug('parsed response %s', response)
|
||||
elif msg_type == MSG_TYPE_BLOB:
|
||||
response = resp
|
||||
elif msg_type == MSG_TYPE_ERROR:
|
||||
raise RpcError(unicode(resp, 'utf-8'))
|
||||
else:
|
||||
raise RpcError('unknown RPC msg type %d' % msg_type)
|
||||
|
||||
controller.response = response
|
||||
|
||||
except socket.error as e:
|
||||
error = 'ERROR: RPC %s() to Drone %s failed (%s)' % (
|
||||
method.name, self.peer, e)
|
||||
self.log.exception(error+e)
|
||||
raise
|
||||
except PeerClosedConnError as e:
|
||||
error = 'ERROR: Drone %s closed connection receiving reply ' \
|
||||
'for RPC %s() (%s)' % (
|
||||
self.peer, method.name, e)
|
||||
self.log.exception(error)
|
||||
raise
|
||||
except EncodeError as e:
|
||||
error = 'ERROR: Failed to serialize %s arg for RPC %s() ' \
|
||||
'to Drone %s (%s)' % (
|
||||
type(request).__name__, method.name, self.peer, e)
|
||||
self.log.exception(error)
|
||||
raise
|
||||
except DecodeError as e:
|
||||
error = 'ERROR: Failed to parse %s response for RPC %s() ' \
|
||||
'from Drone %s (%s)' % (
|
||||
type(response).__name__, method.name, self.peer, e)
|
||||
self.log.exception(error)
|
||||
raise
|
||||
except RpcMismatchError as e:
|
||||
error = 'ERROR: Rpc Mismatch for RPC %s() (%s)' % (
|
||||
method.name, e)
|
||||
self.log.exception(error)
|
||||
raise
|
||||
except RpcError as e:
|
||||
error = 'ERROR: error received for RPC %s() (%s) ' % (
|
||||
method.name, e)
|
||||
self.log.exception(error)
|
||||
raise
|
||||
finally:
|
||||
if error:
|
||||
print(error)
|
||||
|
||||
|
||||
|
@ -1,84 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright (C) 2014 Srivats P.
|
||||
#
|
||||
# This file is part of "Ostinato"
|
||||
#
|
||||
# This 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/>
|
||||
|
||||
import json
|
||||
import os
|
||||
import shutil
|
||||
import sys
|
||||
from setuptools import Command, setup
|
||||
from setuptools.command.sdist import sdist as _sdist
|
||||
|
||||
def read(fname):
|
||||
return open(os.path.join(os.path.dirname(__file__), fname)).read()
|
||||
|
||||
def ensure_cwd():
|
||||
if os.path.split(os.getcwd())[1] != 'binding':
|
||||
print('ERROR: This script needs to be run from the binding directory')
|
||||
print('Current Working Directory is %s' % os.getcwd())
|
||||
sys.exit(1)
|
||||
|
||||
class sdist(_sdist):
|
||||
def run(self):
|
||||
ensure_cwd()
|
||||
_sdist.run(self)
|
||||
|
||||
class sdist_clean(Command):
|
||||
description = 'clean stuff generated by sdist'
|
||||
user_options = []
|
||||
def initialize_options(self):
|
||||
return
|
||||
|
||||
def finalize_options(self):
|
||||
return
|
||||
|
||||
def run(self):
|
||||
ensure_cwd()
|
||||
shutil.rmtree('dist', ignore_errors = True)
|
||||
shutil.rmtree('python-ostinato.egg-info', ignore_errors = True)
|
||||
shutil.rmtree('python_ostinato.egg-info', ignore_errors = True)
|
||||
|
||||
# ------- script starts from here ------- #
|
||||
|
||||
with open(os.path.join(os.path.dirname(__file__), 'pkg_info.json')) as f:
|
||||
pkg_info = json.load(f)
|
||||
|
||||
setup(name = 'python-ostinato',
|
||||
version = pkg_info['version'],
|
||||
author = 'Srivats P',
|
||||
author_email = 'pstavirs@gmail.com',
|
||||
license = "GPLv3+",
|
||||
url = 'http://ostinato.org',
|
||||
description = 'python-ostinato provides python bindings for the Ostinato network packet/traffic generator and analyzer',
|
||||
long_description = read('README.txt'),
|
||||
install_requires = ['protobuf>=2.3.0'],
|
||||
packages = ['ostinato', 'ostinato.protocols'],
|
||||
package_dir = {'ostinato': '.'},
|
||||
package_data = {'ostinato': ['pkg_info.json', 'LICENSE.txt']},
|
||||
platforms = ['Any'],
|
||||
classifiers = [
|
||||
'Development Status :: 4 - Beta',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Intended Audience :: Telecommunications Industry',
|
||||
'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
|
||||
'Topic :: Software Development :: Testing :: Traffic Generation',
|
||||
'Topic :: System :: Networking'],
|
||||
cmdclass={
|
||||
'sdist': sdist,
|
||||
'sdist_clean': sdist_clean},
|
||||
)
|
||||
|
BIN
client/icons/stream_stats.png
Normal file
BIN
client/icons/stream_stats.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 714 B |
@ -96,7 +96,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
portsDock->setObjectName("portsDock");
|
||||
portsDock->setFeatures(
|
||||
portsDock->features() & ~QDockWidget::DockWidgetClosable);
|
||||
statsDock = new QDockWidget(tr("Statistics"), this);
|
||||
statsDock = new QDockWidget(tr("Port Statistics"), this);
|
||||
statsDock->setObjectName("statsDock");
|
||||
statsDock->setFeatures(
|
||||
statsDock->features() & ~QDockWidget::DockWidgetClosable);
|
||||
@ -166,6 +166,13 @@ MainWindow::~MainWindow()
|
||||
|
||||
delete pgl;
|
||||
|
||||
// We don't want to save state for Stream Stats Docks - so delete them
|
||||
QList<QDockWidget*> streamStatsDocks
|
||||
= findChildren<QDockWidget*>("streamStatsDock");
|
||||
foreach(QDockWidget *dock, streamStatsDocks)
|
||||
delete dock;
|
||||
Q_ASSERT(findChildren<QDockWidget*>("streamStatsDock").size() == 0);
|
||||
|
||||
QByteArray layout = saveState(0);
|
||||
appSettings->setValue(kApplicationWindowLayout, layout);
|
||||
appSettings->setValue(kApplicationWindowGeometryKey, geometry());
|
||||
@ -309,6 +316,16 @@ void MainWindow::on_actionViewRestoreDefaults_triggered()
|
||||
setGeometry(defaultGeometry_);
|
||||
restoreState(defaultLayout_, 0);
|
||||
|
||||
// Add streamStats as tabs
|
||||
QList<QDockWidget*> streamStatsDocks
|
||||
= findChildren<QDockWidget*>("streamStatsDock");
|
||||
foreach(QDockWidget *dock, streamStatsDocks) {
|
||||
dock->setFloating(false);
|
||||
tabifyDockWidget(statsDock, dock);
|
||||
}
|
||||
statsDock->show();
|
||||
statsDock->raise();
|
||||
|
||||
actionViewShowMyReservedPortsOnly->setChecked(false);
|
||||
}
|
||||
|
||||
|
@ -58,6 +58,9 @@ HEADERS += \
|
||||
streamconfigdialog.h \
|
||||
streamlistdelegate.h \
|
||||
streammodel.h \
|
||||
streamstatsfiltermodel.h \
|
||||
streamstatsmodel.h \
|
||||
streamstatswindow.h \
|
||||
variablefieldswidget.h
|
||||
|
||||
FORMS += \
|
||||
@ -71,6 +74,7 @@ FORMS += \
|
||||
portswindow.ui \
|
||||
preferences.ui \
|
||||
streamconfigdialog.ui \
|
||||
streamstatswindow.ui \
|
||||
variablefieldswidget.ui
|
||||
|
||||
SOURCES += \
|
||||
@ -100,6 +104,8 @@ SOURCES += \
|
||||
streamconfigdialog.cpp \
|
||||
streamlistdelegate.cpp \
|
||||
streammodel.cpp \
|
||||
streamstatsmodel.cpp \
|
||||
streamstatswindow.cpp \
|
||||
variablefieldswidget.cpp
|
||||
|
||||
|
||||
|
@ -42,5 +42,6 @@
|
||||
<file>icons/stream_delete.png</file>
|
||||
<file>icons/stream_duplicate.png</file>
|
||||
<file>icons/stream_edit.png</file>
|
||||
<file>icons/stream_stats.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
@ -100,6 +100,8 @@ public:
|
||||
{ return d.is_exclusive_control(); }
|
||||
OstProto::TransmitMode transmitMode() const
|
||||
{ return d.transmit_mode(); }
|
||||
bool trackStreamStats() const
|
||||
{ return d.is_tracking_stream_stats(); }
|
||||
double averagePacketRate() const
|
||||
{ return avgPacketsPerSec_; }
|
||||
double averageBitRate() const
|
||||
|
@ -20,7 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
#include "portconfigdialog.h"
|
||||
#include "settings.h"
|
||||
|
||||
PortConfigDialog::PortConfigDialog(OstProto::Port &portConfig, QWidget *parent)
|
||||
PortConfigDialog::PortConfigDialog(
|
||||
OstProto::Port &portConfig,
|
||||
const OstProto::PortState &portState,
|
||||
QWidget *parent)
|
||||
: QDialog(parent), portConfig_(portConfig)
|
||||
{
|
||||
QString currentUser(portConfig_.user_name().c_str());
|
||||
@ -64,6 +67,13 @@ PortConfigDialog::PortConfigDialog(OstProto::Port &portConfig, QWidget *parent)
|
||||
qDebug("reservedBy_ = %d", reservedBy_);
|
||||
|
||||
exclusiveControlButton->setChecked(portConfig_.is_exclusive_control());
|
||||
streamStatsButton->setChecked(portConfig_.is_tracking_stream_stats());
|
||||
|
||||
// Disable UI elements based on portState
|
||||
if (portState.is_transmit_on()) {
|
||||
transmitModeBox->setDisabled(true);
|
||||
streamStatsButton->setDisabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
void PortConfigDialog::accept()
|
||||
@ -95,6 +105,7 @@ void PortConfigDialog::accept()
|
||||
}
|
||||
|
||||
pc.set_is_exclusive_control(exclusiveControlButton->isChecked());
|
||||
pc.set_is_tracking_stream_stats(streamStatsButton->isChecked());
|
||||
|
||||
// Update fields that have changed, clear the rest
|
||||
if (pc.transmit_mode() != portConfig_.transmit_mode())
|
||||
@ -112,5 +123,10 @@ void PortConfigDialog::accept()
|
||||
else
|
||||
portConfig_.clear_is_exclusive_control();
|
||||
|
||||
if (pc.is_tracking_stream_stats() != portConfig_.is_tracking_stream_stats())
|
||||
portConfig_.set_is_tracking_stream_stats(pc.is_tracking_stream_stats());
|
||||
else
|
||||
portConfig_.clear_is_tracking_stream_stats();
|
||||
|
||||
QDialog::accept();
|
||||
}
|
||||
|
@ -27,7 +27,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
class PortConfigDialog : public QDialog, public Ui::PortConfigDialog
|
||||
{
|
||||
public:
|
||||
PortConfigDialog(OstProto::Port &portConfig, QWidget *parent);
|
||||
PortConfigDialog(OstProto::Port &portConfig,
|
||||
const OstProto::PortState& portState,
|
||||
QWidget *parent);
|
||||
|
||||
private:
|
||||
virtual void accept();
|
||||
|
@ -6,7 +6,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>244</width>
|
||||
<height>233</height>
|
||||
<height>257</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
@ -69,6 +69,13 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="streamStatsButton" >
|
||||
<property name="text" >
|
||||
<string>Stream Statistics</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
|
@ -1593,13 +1593,14 @@ void PortGroup::clearPortStats(QList<uint> *portList)
|
||||
}
|
||||
|
||||
serviceStub->clearStats(controller, portIdList, ack,
|
||||
NewCallback(this, &PortGroup::processClearStatsAck, controller));
|
||||
NewCallback(this, &PortGroup::processClearPortStatsAck,
|
||||
controller));
|
||||
}
|
||||
_exit:
|
||||
return;
|
||||
}
|
||||
|
||||
void PortGroup::processClearStatsAck(PbRpcController *controller)
|
||||
void PortGroup::processClearPortStatsAck(PbRpcController *controller)
|
||||
{
|
||||
qDebug("In %s", __FUNCTION__);
|
||||
|
||||
@ -1609,3 +1610,78 @@ void PortGroup::processClearStatsAck(PbRpcController *controller)
|
||||
delete controller;
|
||||
}
|
||||
|
||||
bool PortGroup::clearStreamStats(QList<uint> *portList)
|
||||
{
|
||||
qDebug("In %s", __FUNCTION__);
|
||||
|
||||
if (state() != QAbstractSocket::ConnectedState)
|
||||
return false;
|
||||
|
||||
OstProto::StreamGuidList *guidList = new OstProto::StreamGuidList;
|
||||
OstProto::Ack *ack = new OstProto::Ack;
|
||||
PbRpcController *controller = new PbRpcController(guidList, ack);
|
||||
|
||||
if (portList == NULL)
|
||||
guidList->mutable_port_id_list()->CopyFrom(*portIdList_);
|
||||
else
|
||||
for (int i = 0; i < portList->size(); i++)
|
||||
guidList->mutable_port_id_list()->add_port_id()
|
||||
->set_id(portList->at(i));
|
||||
|
||||
serviceStub->clearStreamStats(controller, guidList, ack,
|
||||
NewCallback(this, &PortGroup::processClearStreamStatsAck,
|
||||
controller));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void PortGroup::processClearStreamStatsAck(PbRpcController *controller)
|
||||
{
|
||||
qDebug("In %s", __FUNCTION__);
|
||||
|
||||
delete controller;
|
||||
}
|
||||
|
||||
bool PortGroup::getStreamStats(QList<uint> *portList)
|
||||
{
|
||||
qDebug("In %s", __FUNCTION__);
|
||||
|
||||
if (state() != QAbstractSocket::ConnectedState)
|
||||
return false;
|
||||
|
||||
OstProto::StreamGuidList *guidList = new OstProto::StreamGuidList;
|
||||
OstProto::StreamStatsList *statsList = new OstProto::StreamStatsList;
|
||||
PbRpcController *controller = new PbRpcController(guidList, statsList);
|
||||
|
||||
if (portList == NULL)
|
||||
guidList->mutable_port_id_list()->CopyFrom(*portIdList_);
|
||||
else
|
||||
for (int i = 0; i < portList->size(); i++)
|
||||
guidList->mutable_port_id_list()->add_port_id()
|
||||
->set_id(portList->at(i));
|
||||
|
||||
serviceStub->getStreamStats(controller, guidList, statsList,
|
||||
NewCallback(this, &PortGroup::processStreamStatsList, controller));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void PortGroup::processStreamStatsList(PbRpcController *controller)
|
||||
{
|
||||
using OstProto::StreamStatsList;
|
||||
|
||||
qDebug("In %s", __FUNCTION__);
|
||||
|
||||
StreamStatsList *streamStatsList =
|
||||
static_cast<StreamStatsList*>(controller->response());
|
||||
|
||||
// XXX: It is required to emit the signal even if the returned
|
||||
// streamStatsList contains no records since the recipient
|
||||
// StreamStatsModel slot needs to disconnect this signal-slot
|
||||
// connection to prevent future stream stats for this portgroup
|
||||
// to be sent to it
|
||||
emit streamStatsReceived(mPortGroupId, streamStatsList);
|
||||
|
||||
delete controller;
|
||||
}
|
||||
|
||||
|
@ -39,6 +39,7 @@ LOW
|
||||
namespace OstProto {
|
||||
class PortContent;
|
||||
class PortGroupContent;
|
||||
class StreamStatsList;
|
||||
}
|
||||
|
||||
class QFile;
|
||||
@ -163,13 +164,19 @@ public:
|
||||
void getPortStats();
|
||||
void processPortStatsList();
|
||||
void clearPortStats(QList<uint> *portList = NULL);
|
||||
void processClearStatsAck(PbRpcController *controller);
|
||||
void processClearPortStatsAck(PbRpcController *controller);
|
||||
bool clearStreamStats(QList<uint> *portList = NULL);
|
||||
void processClearStreamStatsAck(PbRpcController *controller);
|
||||
bool getStreamStats(QList<uint> *portList = NULL);
|
||||
void processStreamStatsList(PbRpcController *controller);
|
||||
|
||||
signals:
|
||||
void portGroupDataChanged(int portGroupId, int portId = 0xFFFF);
|
||||
void portListAboutToBeChanged(quint32 portGroupId);
|
||||
void portListChanged(quint32 portGroupId);
|
||||
void statsChanged(quint32 portGroupId);
|
||||
void streamStatsReceived(quint32 portGroupId,
|
||||
const OstProto::StreamStatsList *stats);
|
||||
|
||||
private slots:
|
||||
void on_reconnectTimer_timeout();
|
||||
|
@ -170,6 +170,7 @@ QVariant PortStatsModel::data(const QModelIndex &index, int role) const
|
||||
case e_STAT_BYTES_SENT_NIC:
|
||||
return stats.tx_bytes_nic();
|
||||
#endif
|
||||
|
||||
case e_STAT_RX_DROPS : return quint64(stats.rx_drops());
|
||||
case e_STAT_RX_ERRORS: return quint64(stats.rx_errors());
|
||||
case e_STAT_RX_FIFO_ERRORS: return quint64(stats.rx_fifo_errors());
|
||||
|
@ -66,6 +66,7 @@ typedef enum {
|
||||
e_STAT_RX_FIFO_ERRORS,
|
||||
e_STAT_RX_FRAME_ERRORS,
|
||||
|
||||
|
||||
e_STATISTICS_END = e_STAT_RX_FRAME_ERRORS,
|
||||
|
||||
e_STAT_MAX
|
||||
@ -92,6 +93,7 @@ static QStringList PortStatName = (QStringList()
|
||||
<< "Bytes Received (NIC)"
|
||||
<< "Bytes Sent (NIC)"
|
||||
#endif
|
||||
|
||||
<< "Receive Drops"
|
||||
<< "Receive Errors"
|
||||
<< "Receive Fifo Errors"
|
||||
|
@ -23,9 +23,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
#include "portstatsfilterdialog.h"
|
||||
#include "portstatsmodel.h"
|
||||
#include "portstatsproxymodel.h"
|
||||
#include "streamstatsmodel.h"
|
||||
#include "streamstatswindow.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include <QDockWidget>
|
||||
#include <QHeaderView>
|
||||
#include <QMainWindow>
|
||||
|
||||
extern QMainWindow *mainWindow;
|
||||
|
||||
PortStatsWindow::PortStatsWindow(PortGroupList *pgl, QWidget *parent)
|
||||
: QWidget(parent), proxyStatsModel(NULL)
|
||||
@ -227,6 +233,8 @@ void PortStatsWindow::on_tbClear_clicked()
|
||||
{
|
||||
pgl->portGroupByIndex(portList.at(i).portGroupId).
|
||||
clearPortStats(&portList[i].portList);
|
||||
pgl->portGroupByIndex(portList.at(i).portGroupId).
|
||||
clearStreamStats(&portList[i].portList);
|
||||
}
|
||||
}
|
||||
|
||||
@ -253,6 +261,44 @@ void PortStatsWindow::on_tbClearAll_clicked()
|
||||
{
|
||||
pgl->portGroupByIndex(portList.at(i).portGroupId)
|
||||
.clearPortStats(&portList[i].portList);
|
||||
pgl->portGroupByIndex(portList.at(i).portGroupId)
|
||||
.clearStreamStats(&portList[i].portList);
|
||||
}
|
||||
}
|
||||
|
||||
void PortStatsWindow::on_tbGetStreamStats_clicked()
|
||||
{
|
||||
QList<PortStatsModel::PortGroupAndPortList> portList;
|
||||
StreamStatsModel *streamStatsModel;
|
||||
|
||||
// Get selected ports
|
||||
model->portListFromIndex(selectedColumns, portList);
|
||||
|
||||
if (portList.size()) {
|
||||
QDockWidget *dock = new QDockWidget(mainWindow);
|
||||
streamStatsModel = new StreamStatsModel(dock);
|
||||
dock->setWidget(new StreamStatsWindow(streamStatsModel, dock));
|
||||
dock->setWindowTitle(dock->widget()->windowTitle());
|
||||
dock->setObjectName("streamStatsDock");
|
||||
dock->setAttribute(Qt::WA_DeleteOnClose);
|
||||
QDockWidget *statsDock = mainWindow->findChild<QDockWidget*>(
|
||||
"statsDock");
|
||||
mainWindow->addDockWidget(Qt::BottomDockWidgetArea, dock);
|
||||
mainWindow->tabifyDockWidget(statsDock, dock);
|
||||
dock->show();
|
||||
dock->raise();
|
||||
}
|
||||
|
||||
// Get stream stats for selected ports, portgroup by portgroup
|
||||
for (int i = 0; i < portList.size(); i++)
|
||||
{
|
||||
PortGroup &pg = pgl->portGroupByIndex(portList.at(i).portGroupId);
|
||||
if (pg.getStreamStats(&portList[i].portList)) {
|
||||
connect(&pg,SIGNAL(streamStatsReceived(
|
||||
quint32, const OstProto::StreamStatsList*)),
|
||||
streamStatsModel, SLOT(appendStreamStatsList(
|
||||
quint32, const OstProto::StreamStatsList*)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -52,6 +52,7 @@ private slots:
|
||||
|
||||
void on_tbClear_clicked();
|
||||
void on_tbClearAll_clicked();
|
||||
void on_tbGetStreamStats_clicked();
|
||||
|
||||
void on_tbResolveNeighbors_clicked();
|
||||
void on_tbClearNeighbors_clicked();
|
||||
|
@ -112,6 +112,22 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="tbGetStreamStats" >
|
||||
<property name="toolTip" >
|
||||
<string>Fetch Selected Port Stream Stats</string>
|
||||
</property>
|
||||
<property name="statusTip" >
|
||||
<string>Fetches stream statistics from the selected port(s)</string>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Fetch Stream Stats</string>
|
||||
</property>
|
||||
<property name="icon" >
|
||||
<iconset resource="ostinato.qrc" >:/icons/stream_stats.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Line" name="line_3">
|
||||
<property name="orientation">
|
||||
@ -127,8 +143,8 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="tbStartCapture">
|
||||
<property name="toolTip">
|
||||
<widget class="QToolButton" name="tbStartCapture" >
|
||||
<property name="toolTip" >
|
||||
<string>Start Capture</string>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
|
@ -755,12 +755,19 @@ void PortsWindow::on_actionPort_Configuration_triggered()
|
||||
if (!plm->isPort(current))
|
||||
return;
|
||||
|
||||
Port &port = plm->port(current);
|
||||
OstProto::Port config;
|
||||
config.set_transmit_mode(plm->port(current).transmitMode());
|
||||
config.set_is_exclusive_control(plm->port(current).hasExclusiveControl());
|
||||
config.set_user_name(plm->port(current).userName().toStdString());
|
||||
// XXX: we don't call Port::protoDataCopyInto() to get config b'coz
|
||||
// we want only the modifiable fields populated to send to Drone
|
||||
// TODO: extend Port::protoDataCopyInto() to accept an optional param
|
||||
// which says copy only modifiable fields
|
||||
//plm->port(current).protoDataCopyInto(&config);
|
||||
config.set_transmit_mode(port.transmitMode());
|
||||
config.set_is_tracking_stream_stats(port.trackStreamStats());
|
||||
config.set_is_exclusive_control(port.hasExclusiveControl());
|
||||
config.set_user_name(port.userName().toStdString());
|
||||
|
||||
PortConfigDialog dialog(config, this);
|
||||
PortConfigDialog dialog(config, port.getStats().state(), this);
|
||||
|
||||
if (dialog.exec() == QDialog::Accepted)
|
||||
plm->portGroup(current.parent()).modifyPort(current.row(), config);
|
||||
|
@ -85,13 +85,14 @@ StreamConfigDialog::StreamConfigDialog(
|
||||
|
||||
// Time to play match the signals and slots!
|
||||
|
||||
// If L1/L2(FT)/L3 = None, force subsequent protocol level(s) also to None
|
||||
// If L1/L2(FT)/L3/L4 = None,
|
||||
// force subsequent protocol level(s) also to None
|
||||
connect(rbL1None, SIGNAL(toggled(bool)), SLOT(forceProtocolNone(bool)));
|
||||
connect(rbFtNone, SIGNAL(toggled(bool)), SLOT(forceProtocolNone(bool)));
|
||||
connect(rbL3None, SIGNAL(toggled(bool)), SLOT(forceProtocolNone(bool)));
|
||||
connect(rbL4None, SIGNAL(toggled(bool)), SLOT(forceProtocolNone(bool)));
|
||||
|
||||
// If L1/L2(FT)/L3/L4 = Other, force subsequent protocol to Other and
|
||||
// If L1/L2(FT)/L3/L4/L5 = Other, force subsequent protocol to Other and
|
||||
// disable the subsequent protocol group as well
|
||||
connect(rbL1Other, SIGNAL(toggled(bool)), rbFtOther, SLOT(setChecked(bool)));
|
||||
connect(rbL1Other, SIGNAL(toggled(bool)), gbFrameType, SLOT(setDisabled(bool)));
|
||||
@ -99,8 +100,10 @@ StreamConfigDialog::StreamConfigDialog(
|
||||
connect(rbFtOther, SIGNAL(toggled(bool)), gbL3Proto, SLOT(setDisabled(bool)));
|
||||
connect(rbL3Other, SIGNAL(toggled(bool)), rbL4Other, SLOT(setChecked(bool)));
|
||||
connect(rbL3Other, SIGNAL(toggled(bool)), gbL4Proto, SLOT(setDisabled(bool)));
|
||||
connect(rbL4Other, SIGNAL(toggled(bool)), rbPayloadOther, SLOT(setChecked(bool)));
|
||||
connect(rbL4Other, SIGNAL(toggled(bool)), gbPayloadProto, SLOT(setDisabled(bool)));
|
||||
connect(rbL4Other, SIGNAL(toggled(bool)), rbL5Other, SLOT(setChecked(bool)));
|
||||
connect(rbL4Other, SIGNAL(toggled(bool)), gbL5Proto, SLOT(setDisabled(bool)));
|
||||
connect(rbL5Other, SIGNAL(toggled(bool)), rbPayloadOther, SLOT(setChecked(bool)));
|
||||
connect(rbL5Other, SIGNAL(toggled(bool)), gbPayloadProto, SLOT(setDisabled(bool)));
|
||||
|
||||
// Setup valid subsequent protocols for L2 to L4 protocols
|
||||
for (int i = ProtoL2; i <= ProtoL4; i++)
|
||||
@ -294,6 +297,17 @@ void StreamConfigDialog::setupUiExtra()
|
||||
bgProto[ProtoPayload]->addButton(rbPayloadHexDump, OstProto::Protocol::kHexDumpFieldNumber);
|
||||
bgProto[ProtoPayload]->addButton(rbPayloadOther, ButtonIdOther);
|
||||
#endif
|
||||
|
||||
// Special
|
||||
bgProto[ProtoSign] = new QButtonGroup();
|
||||
bgProto[ProtoSign]->addButton(rbSpecialNone, ButtonIdNone);
|
||||
bgProto[ProtoSign]->addButton(rbSignature,
|
||||
OstProto::Protocol::kSignFieldNumber);
|
||||
// Trailer
|
||||
bgProto[ProtoTrailer] = new QButtonGroup();
|
||||
bgProto[ProtoTrailer]->addButton(rbTrailerNone, ButtonIdNone);
|
||||
bgProto[ProtoTrailer]->addButton(rbTrailerOther, ButtonIdOther);
|
||||
|
||||
/*
|
||||
** Setup Validators
|
||||
*/
|
||||
@ -788,6 +802,8 @@ void StreamConfigDialog::forceProtocolNone(bool checked)
|
||||
}
|
||||
}
|
||||
|
||||
// Button 'newId' has been clicked
|
||||
// - update the protocol list correspondingly
|
||||
void StreamConfigDialog::updateProtocol(int newId)
|
||||
{
|
||||
int level;
|
||||
@ -802,6 +818,8 @@ void StreamConfigDialog::updateProtocol(int newId)
|
||||
__updateProtocol(level, newId);
|
||||
}
|
||||
|
||||
// Button 'newId' belonging to layer 'level' has been clicked
|
||||
// - update the protocol list correspondingly
|
||||
void StreamConfigDialog::__updateProtocol(int level, int newId)
|
||||
{
|
||||
int oldId;
|
||||
@ -849,7 +867,7 @@ void StreamConfigDialog::__updateProtocol(int level, int newId)
|
||||
// Free both protocol and associated widget
|
||||
delete _protocolWidgets.take(p);
|
||||
delete p;
|
||||
if (level == ProtoPayload)
|
||||
if (level == ProtoTrailer)
|
||||
{
|
||||
while (_iter->hasNext())
|
||||
{
|
||||
@ -868,6 +886,7 @@ void StreamConfigDialog::__updateProtocol(int level, int newId)
|
||||
return;
|
||||
}
|
||||
|
||||
//! Traverse the ProtocolList and update the SelectProtocols (Simple) widget
|
||||
void StreamConfigDialog::updateSelectProtocolsSimpleWidget()
|
||||
{
|
||||
int i;
|
||||
@ -893,7 +912,7 @@ void StreamConfigDialog::updateSelectProtocolsSimpleWidget()
|
||||
id = _iter->next()->protocolNumber();
|
||||
btn = bgProto[i]->button(id);
|
||||
|
||||
if (btn)
|
||||
if (btn) // we have a button for this protocol
|
||||
{
|
||||
if (btn->isEnabled())
|
||||
btn->click();
|
||||
@ -903,23 +922,32 @@ void StreamConfigDialog::updateSelectProtocolsSimpleWidget()
|
||||
__updateProtocol(i, id);
|
||||
}
|
||||
}
|
||||
else
|
||||
else // we don't have a button for this protocol
|
||||
{
|
||||
switch (i)
|
||||
{
|
||||
case ProtoVlan:
|
||||
// No vlan - proto may belong to next layer
|
||||
_iter->previous();
|
||||
break;
|
||||
|
||||
case ProtoSign:
|
||||
// No sign - but we have a trailer
|
||||
_iter->previous();
|
||||
break;
|
||||
|
||||
case ProtoPayload:
|
||||
goto _other;
|
||||
|
||||
default:
|
||||
default: // viz. L1, L2, L3, L4, L5, Trailer
|
||||
// Is this a Payload layer protocol?
|
||||
// (maybe intermediate layers are not present)
|
||||
btn = bgProto[ProtoPayload]->button(id);
|
||||
if (btn && btn->isEnabled())
|
||||
{
|
||||
btn->click();
|
||||
break;
|
||||
i = ProtoPayload;
|
||||
continue;
|
||||
}
|
||||
else
|
||||
goto _other;
|
||||
@ -927,20 +955,22 @@ void StreamConfigDialog::updateSelectProtocolsSimpleWidget()
|
||||
}
|
||||
}
|
||||
|
||||
// If more protocol(s) beyond payload ...
|
||||
// If more protocol(s) beyond trailer ...
|
||||
if (_iter->hasNext())
|
||||
{
|
||||
i = ProtoPayload;
|
||||
i = ProtoTrailer;
|
||||
goto _other;
|
||||
}
|
||||
|
||||
Q_ASSERT(!_iter->hasNext()); // At end of the ProtocolList
|
||||
goto _done;
|
||||
|
||||
_other:
|
||||
// Set remaining protocols as 'Other'
|
||||
for (int j = i; j < ProtoMax; j++)
|
||||
{
|
||||
// VLAN doesn't have a "Other" button
|
||||
if (j == ProtoVlan)
|
||||
// VLAN/Sign doesn't have a "Other" button
|
||||
if ((j == ProtoVlan) || (j == ProtoSign))
|
||||
continue;
|
||||
|
||||
bgProto[j]->button(ButtonIdOther)->setChecked(true);
|
||||
@ -1212,6 +1242,13 @@ bool StreamConfigDialog::isCurrentStreamValid()
|
||||
"varying fields at transmit time may not be same as configured");
|
||||
}
|
||||
|
||||
if (!mPort.trackStreamStats()
|
||||
&& mpStream->hasProtocol(OstProto::Protocol::kSignFieldNumber))
|
||||
{
|
||||
log << tr("Stream contains special signature, but per stream statistics "
|
||||
"will not be available till it is enabled on the port");
|
||||
}
|
||||
|
||||
mpStream->preflightCheck(log);
|
||||
|
||||
if (log.size())
|
||||
|
@ -67,6 +67,8 @@ private:
|
||||
ProtoL4 = 4,
|
||||
ProtoL5 = 5,
|
||||
ProtoPayload = 6,
|
||||
ProtoSign = 7,
|
||||
ProtoTrailer = 8,
|
||||
ProtoMax
|
||||
};
|
||||
|
||||
|
@ -9,8 +9,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>634</width>
|
||||
<height>507</height>
|
||||
<width>647</width>
|
||||
<height>549</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
@ -164,8 +164,8 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-colo
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>592</width>
|
||||
<height>269</height>
|
||||
<width>605</width>
|
||||
<height>311</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="label">
|
||||
@ -211,9 +211,9 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-colo
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" rowspan="2">
|
||||
<widget class="QGroupBox" name="gbFrameType">
|
||||
<property name="enabled">
|
||||
<item rowspan="3" row="0" column="1" >
|
||||
<widget class="QGroupBox" name="gbFrameType" >
|
||||
<property name="enabled" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title">
|
||||
@ -394,51 +394,9 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-colo
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="3">
|
||||
<widget class="QGroupBox" name="gbL5Proto">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>L5</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout">
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbL5None">
|
||||
<property name="text">
|
||||
<string>None</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbL5Text">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Text</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbL5Other">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Other</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QGroupBox" name="gbVlan">
|
||||
<property name="enabled">
|
||||
<item rowspan="2" row="1" column="0" >
|
||||
<widget class="QGroupBox" name="gbVlan" >
|
||||
<property name="enabled" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title">
|
||||
@ -560,9 +518,51 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-colo
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QGroupBox" name="gbPayloadProto">
|
||||
<property name="enabled">
|
||||
<item row="2" column="2" >
|
||||
<widget class="QGroupBox" name="gbL5Proto" >
|
||||
<property name="enabled" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title" >
|
||||
<string>L5</string>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" >
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbL5None" >
|
||||
<property name="text" >
|
||||
<string>None</string>
|
||||
</property>
|
||||
<property name="checked" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbL5Text" >
|
||||
<property name="enabled" >
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Text</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbL5Other" >
|
||||
<property name="enabled" >
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Other</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="3" >
|
||||
<widget class="QGroupBox" name="gbPayloadProto" >
|
||||
<property name="enabled" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title">
|
||||
@ -609,6 +609,67 @@ QLineEdit:enabled[inputMask = "HH HH HH HH HH HH; "] { background-colo
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3" >
|
||||
<widget class="QGroupBox" name="gbSpecial" >
|
||||
<property name="enabled" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title" >
|
||||
<string>Special</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" >
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbSpecialNone" >
|
||||
<property name="text" >
|
||||
<string>None</string>
|
||||
</property>
|
||||
<property name="checked" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbSignature" >
|
||||
<property name="text" >
|
||||
<string>Signature</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="3" >
|
||||
<widget class="QGroupBox" name="gbTrailer" >
|
||||
<property name="enabled" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title" >
|
||||
<string>Trailer</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" >
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbTrailerNone" >
|
||||
<property name="text" >
|
||||
<string>None</string>
|
||||
</property>
|
||||
<property name="checked" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbTrailerOther" >
|
||||
<property name="enabled" >
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Other</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="page_2">
|
||||
|
50
client/streamstatsfiltermodel.h
Normal file
50
client/streamstatsfiltermodel.h
Normal file
@ -0,0 +1,50 @@
|
||||
/*
|
||||
Copyright (C) 2017 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _STREAM_STATS_FILTER_MODEL_H
|
||||
#define _STREAM_STATS_FILTER_MODEL_H
|
||||
|
||||
#include <QSortFilterProxyModel>
|
||||
|
||||
class StreamStatsFilterModel : public QSortFilterProxyModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
StreamStatsFilterModel(QObject *parent = 0)
|
||||
: QSortFilterProxyModel(parent)
|
||||
{
|
||||
}
|
||||
|
||||
protected:
|
||||
bool filterAcceptsColumn(int sourceColumn,
|
||||
const QModelIndex &/*sourceParent*/) const
|
||||
{
|
||||
QString title = sourceModel()->headerData(sourceColumn, Qt::Horizontal)
|
||||
.toString();
|
||||
return filterRegExp().exactMatch(title) ? true : false;
|
||||
}
|
||||
bool filterAcceptsRow(int /*sourceRow*/,
|
||||
const QModelIndex &/*sourceParent*/) const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
234
client/streamstatsmodel.cpp
Normal file
234
client/streamstatsmodel.cpp
Normal file
@ -0,0 +1,234 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#include "streamstatsmodel.h"
|
||||
|
||||
#include "protocol.pb.h"
|
||||
|
||||
#include <QBrush>
|
||||
|
||||
// XXX: Keep the enum in sync with it's string
|
||||
enum {
|
||||
kTxPkts,
|
||||
kRxPkts,
|
||||
kTxBytes,
|
||||
kRxBytes,
|
||||
kMaxStreamStats
|
||||
};
|
||||
static QStringList statTitles = QStringList()
|
||||
<< "Tx Pkts"
|
||||
<< "Rx Pkts"
|
||||
<< "Tx Bytes"
|
||||
<< "Rx Bytes";
|
||||
|
||||
// XXX: Keep the enum in sync with it's string
|
||||
enum {
|
||||
kAggrTxPkts,
|
||||
kAggrRxPkts,
|
||||
kAggrPktLoss,
|
||||
kMaxAggrStreamStats
|
||||
};
|
||||
static QStringList aggrStatTitles = QStringList()
|
||||
<< "Total\nTx Pkts"
|
||||
<< "Total\nRx Pkts"
|
||||
<< "Total\nPkt Loss";
|
||||
|
||||
static const uint kAggrGuid = 0xffffffff;
|
||||
|
||||
StreamStatsModel::StreamStatsModel(QObject *parent)
|
||||
: QAbstractTableModel(parent)
|
||||
{
|
||||
clearStats();
|
||||
}
|
||||
|
||||
int StreamStatsModel::rowCount(const QModelIndex &parent) const
|
||||
{
|
||||
return guidList_.size();
|
||||
}
|
||||
|
||||
int StreamStatsModel::columnCount(const QModelIndex &parent) const
|
||||
{
|
||||
if (!portList_.size())
|
||||
return 0;
|
||||
|
||||
return kMaxAggrStreamStats + portList_.size() * kMaxStreamStats;
|
||||
}
|
||||
|
||||
QVariant StreamStatsModel::headerData(
|
||||
int section, Qt::Orientation orientation, int role) const
|
||||
{
|
||||
if (role != Qt::DisplayRole)
|
||||
return QVariant();
|
||||
|
||||
switch (orientation) {
|
||||
case Qt::Horizontal: // Column Header
|
||||
if (section < kMaxAggrStreamStats)
|
||||
return aggrStatTitles.at(section % kMaxAggrStreamStats);
|
||||
|
||||
section -= kMaxAggrStreamStats;
|
||||
return QString("Port %1-%2\n%3")
|
||||
.arg(portList_.at(section/kMaxStreamStats).first)
|
||||
.arg(portList_.at(section/kMaxStreamStats).second)
|
||||
.arg(statTitles.at(section % kMaxStreamStats));
|
||||
case Qt::Vertical: // Row Header
|
||||
if (section == (guidList_.size() - 1))
|
||||
return QString("GUID Total");
|
||||
return QString("Stream GUID %1")
|
||||
.arg(guidList_.at(section));
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
QVariant StreamStatsModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
if (role == Qt::TextAlignmentRole)
|
||||
return Qt::AlignRight;
|
||||
|
||||
int portColumn = index.column() - kMaxAggrStreamStats;
|
||||
if (role == Qt::BackgroundRole) {
|
||||
if (portColumn < 0)
|
||||
return QBrush(QColor("lavender")); // Aggregate Column
|
||||
if (index.row() == (guidList_.size() - 1))
|
||||
return QBrush(QColor("burlywood")); // Aggregate Row
|
||||
else if ((portColumn/kMaxStreamStats) & 1)
|
||||
return QBrush(QColor("beige")); // Color alternate Ports
|
||||
}
|
||||
|
||||
Guid guid = guidList_.at(index.row());
|
||||
if (role == Qt::ForegroundRole) {
|
||||
if ((index.column() == kAggrPktLoss)
|
||||
&& aggrGuidStats_.value(guid).pktLoss)
|
||||
return QBrush(QColor("firebrick"));
|
||||
}
|
||||
|
||||
if (role != Qt::DisplayRole)
|
||||
return QVariant();
|
||||
|
||||
if (index.column() < kMaxAggrStreamStats) {
|
||||
int stat = index.column() % kMaxAggrStreamStats;
|
||||
switch (stat) {
|
||||
case kAggrRxPkts:
|
||||
return QString("%L1").arg(aggrGuidStats_.value(guid).rxPkts);
|
||||
case kAggrTxPkts:
|
||||
return QString("%L1").arg(aggrGuidStats_.value(guid).txPkts);
|
||||
case kAggrPktLoss:
|
||||
return QString("%L1").arg(aggrGuidStats_.value(guid).pktLoss);
|
||||
default:
|
||||
break;
|
||||
};
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
PortGroupPort pgp = portList_.at(portColumn/kMaxStreamStats);
|
||||
int stat = portColumn % kMaxStreamStats;
|
||||
|
||||
switch (stat) {
|
||||
case kRxPkts:
|
||||
return QString("%L1").arg(streamStats_.value(guid).value(pgp).rxPkts);
|
||||
case kTxPkts:
|
||||
return QString("%L1").arg(streamStats_.value(guid).value(pgp).txPkts);
|
||||
case kRxBytes:
|
||||
return QString("%L1").arg(streamStats_.value(guid).value(pgp).rxBytes);
|
||||
case kTxBytes:
|
||||
return QString("%L1").arg(streamStats_.value(guid).value(pgp).txBytes);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
// --------------------------------------------- //
|
||||
// Slots
|
||||
// --------------------------------------------- //
|
||||
void StreamStatsModel::clearStats()
|
||||
{
|
||||
#if QT_VERSION >= 0x040600
|
||||
beginResetModel();
|
||||
#endif
|
||||
|
||||
guidList_.clear();
|
||||
portList_.clear();
|
||||
streamStats_.clear();
|
||||
aggrGuidStats_.clear();
|
||||
|
||||
#if QT_VERSION >= 0x040600
|
||||
endResetModel();
|
||||
#else
|
||||
reset();
|
||||
#endif
|
||||
}
|
||||
|
||||
void StreamStatsModel::appendStreamStatsList(
|
||||
quint32 portGroupId,
|
||||
const OstProto::StreamStatsList *stats)
|
||||
{
|
||||
int n = stats->stream_stats_size();
|
||||
|
||||
#if QT_VERSION >= 0x040600
|
||||
beginResetModel();
|
||||
#endif
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
const OstProto::StreamStats &s = stats->stream_stats(i);
|
||||
PortGroupPort pgp = PortGroupPort(portGroupId, s.port_id().id());
|
||||
Guid guid = s.stream_guid().id();
|
||||
StreamStats &ss = streamStats_[guid][pgp];
|
||||
StreamStats &aggrPort = streamStats_[kAggrGuid][pgp];
|
||||
AggrGuidStats &aggrGuid = aggrGuidStats_[guid];
|
||||
AggrGuidStats &aggrAggr = aggrGuidStats_[kAggrGuid];
|
||||
|
||||
ss.rxPkts = s.rx_pkts();
|
||||
ss.txPkts = s.tx_pkts();
|
||||
ss.rxBytes = s.rx_bytes();
|
||||
ss.txBytes = s.tx_bytes();
|
||||
|
||||
aggrPort.rxPkts += ss.rxPkts;
|
||||
aggrPort.txPkts += ss.txPkts;
|
||||
aggrPort.rxBytes += ss.rxBytes;
|
||||
aggrPort.txBytes += ss.txBytes;
|
||||
|
||||
aggrGuid.rxPkts += ss.rxPkts;
|
||||
aggrGuid.txPkts += ss.txPkts;
|
||||
aggrGuid.pktLoss += ss.txPkts - ss.rxPkts;
|
||||
|
||||
aggrAggr.rxPkts += ss.rxPkts;
|
||||
aggrAggr.txPkts += ss.txPkts;
|
||||
aggrAggr.pktLoss += ss.txPkts - ss.rxPkts;
|
||||
|
||||
if (!portList_.contains(pgp))
|
||||
portList_.append(pgp);
|
||||
if (!guidList_.contains(guid))
|
||||
guidList_.append(guid);
|
||||
}
|
||||
|
||||
if (guidList_.size())
|
||||
guidList_.append(kAggrGuid);
|
||||
|
||||
#if QT_VERSION >= 0x040600
|
||||
endResetModel();
|
||||
#else
|
||||
reset();
|
||||
#endif
|
||||
|
||||
// Prevent receiving any future updates from this sender
|
||||
disconnect(sender(), 0, this, 0);
|
||||
}
|
70
client/streamstatsmodel.h
Normal file
70
client/streamstatsmodel.h
Normal file
@ -0,0 +1,70 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _STREAM_STATS_MODEL_H
|
||||
#define _STREAM_STATS_MODEL_H
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
#include <QHash>
|
||||
#include <QList>
|
||||
#include <QPair>
|
||||
#include <QStringList>
|
||||
|
||||
namespace OstProto {
|
||||
class StreamStatsList;
|
||||
}
|
||||
|
||||
class StreamStatsModel: public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
StreamStatsModel(QObject *parent = 0);
|
||||
|
||||
int rowCount(const QModelIndex &parent=QModelIndex()) const;
|
||||
int columnCount(const QModelIndex &parent=QModelIndex()) const;
|
||||
|
||||
QVariant headerData(int section, Qt::Orientation orientation,
|
||||
int role = Qt::DisplayRole) const;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
|
||||
public slots:
|
||||
void clearStats();
|
||||
void appendStreamStatsList(quint32 portGroupId,
|
||||
const OstProto::StreamStatsList *stats);
|
||||
private:
|
||||
typedef QPair<uint, uint> PortGroupPort; // Pair = (PortGroupId, PortId)
|
||||
typedef uint Guid;
|
||||
struct StreamStats {
|
||||
quint64 rxPkts;
|
||||
quint64 txPkts;
|
||||
quint64 rxBytes;
|
||||
quint64 txBytes;
|
||||
};
|
||||
struct AggrGuidStats {
|
||||
quint64 rxPkts;
|
||||
quint64 txPkts;
|
||||
qint64 pktLoss;
|
||||
};
|
||||
QList<Guid> guidList_;
|
||||
QList<PortGroupPort> portList_;
|
||||
QHash<Guid, QHash<PortGroupPort, StreamStats> > streamStats_;
|
||||
QHash<Guid, AggrGuidStats> aggrGuidStats_;
|
||||
};
|
||||
#endif
|
||||
|
65
client/streamstatswindow.cpp
Normal file
65
client/streamstatswindow.cpp
Normal file
@ -0,0 +1,65 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#include "streamstatswindow.h"
|
||||
|
||||
#include "streamstatsfiltermodel.h"
|
||||
|
||||
#include <QAbstractItemModel>
|
||||
#include <QHeaderView>
|
||||
|
||||
static int id;
|
||||
static int count;
|
||||
|
||||
StreamStatsWindow::StreamStatsWindow(QAbstractItemModel *model, QWidget *parent)
|
||||
: QWidget(parent)
|
||||
{
|
||||
setupUi(this);
|
||||
streamStats->addAction(actionShowByteCounters);
|
||||
|
||||
if (id)
|
||||
setWindowTitle(windowTitle() + QString("(%1)").arg(id));
|
||||
id++;
|
||||
count++;
|
||||
|
||||
filterModel_ = new StreamStatsFilterModel(this);
|
||||
filterModel_->setFilterRegExp(QRegExp(".*Pkt.*"));
|
||||
filterModel_->setSourceModel(model);
|
||||
streamStats->setModel(filterModel_);
|
||||
|
||||
streamStats->verticalHeader()->setHighlightSections(false);
|
||||
streamStats->verticalHeader()->setDefaultSectionSize(
|
||||
streamStats->verticalHeader()->minimumSectionSize());
|
||||
}
|
||||
|
||||
StreamStatsWindow::~StreamStatsWindow()
|
||||
{
|
||||
delete filterModel_;
|
||||
count--;
|
||||
if (count == 0)
|
||||
id = 0;
|
||||
}
|
||||
|
||||
void StreamStatsWindow::on_actionShowByteCounters_triggered(bool checked)
|
||||
{
|
||||
if (checked)
|
||||
filterModel_->setFilterRegExp(QRegExp(".*"));
|
||||
else
|
||||
filterModel_->setFilterRegExp(QRegExp(".*Pkt.*"));
|
||||
}
|
43
client/streamstatswindow.h
Normal file
43
client/streamstatswindow.h
Normal file
@ -0,0 +1,43 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _STREAM_STATS_WINDOW_H
|
||||
#define _STREAM_STATS_WINDOW_H
|
||||
|
||||
#include "ui_streamstatswindow.h"
|
||||
|
||||
class QAbstractItemModel;
|
||||
class QSortFilterProxyModel;
|
||||
|
||||
class StreamStatsWindow: public QWidget, private Ui::StreamStatsWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
StreamStatsWindow(QAbstractItemModel *model, QWidget *parent = 0);
|
||||
~StreamStatsWindow();
|
||||
|
||||
private slots:
|
||||
void on_actionShowByteCounters_triggered(bool checked);
|
||||
|
||||
private:
|
||||
QSortFilterProxyModel *filterModel_;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
35
client/streamstatswindow.ui
Normal file
35
client/streamstatswindow.ui
Normal file
@ -0,0 +1,35 @@
|
||||
<ui version="4.0" >
|
||||
<class>StreamStatsWindow</class>
|
||||
<widget class="QWidget" name="StreamStatsWindow" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>551</width>
|
||||
<height>452</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Stream Statistics</string>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" >
|
||||
<item>
|
||||
<widget class="QTableView" name="streamStats" >
|
||||
<property name="contextMenuPolicy" >
|
||||
<enum>Qt::ActionsContextMenu</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
<action name="actionShowByteCounters" >
|
||||
<property name="checkable" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Show Byte Counters</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
@ -22,6 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
#include "protocollistiterator.h"
|
||||
#include "streambase.h"
|
||||
|
||||
#include "bswap.h"
|
||||
|
||||
#include <qendian.h>
|
||||
|
||||
/*!
|
||||
@ -972,18 +974,29 @@ out:
|
||||
quint32 AbstractProtocol::protocolFramePayloadCksum(int streamIndex,
|
||||
CksumType cksumType, CksumScope cksumScope) const
|
||||
{
|
||||
quint32 sum = 0;
|
||||
quint32 sum;
|
||||
quint16 cksum;
|
||||
AbstractProtocol *p = next;
|
||||
|
||||
Q_ASSERT(cksumType == CksumIp);
|
||||
|
||||
while (p)
|
||||
{
|
||||
if (!p)
|
||||
return 0xFFFF;
|
||||
|
||||
cksum = p->protocolFrameCksum(streamIndex, cksumType);
|
||||
sum += (quint16) ~cksum;
|
||||
sum = (quint16) ~cksum;
|
||||
if (cksumScope == CksumScopeAdjacentProtocol)
|
||||
goto out;
|
||||
|
||||
p = p->next;
|
||||
while (p)
|
||||
{
|
||||
// when combining cksums, a non-first protocol starting at odd offset
|
||||
// needs a byte swap (see RFC 1071 section(s) 2A, 2B)
|
||||
cksum = p->protocolFrameCksum(streamIndex, cksumType);
|
||||
if (p->protocolFrameOffset(streamIndex) & 0x1)
|
||||
cksum = swap16(cksum);
|
||||
sum += (quint16) ~cksum;
|
||||
p = p->next;
|
||||
}
|
||||
|
||||
@ -998,7 +1011,9 @@ out:
|
||||
while(sum>>16)
|
||||
sum = (sum & 0xFFFF) + (sum >> 16);
|
||||
|
||||
return (quint16) ~sum;
|
||||
cksum = (quint16) ~sum;
|
||||
qDebug("%s: cksum = %u", __FUNCTION__, cksum);
|
||||
return cksum;
|
||||
}
|
||||
|
||||
// Stein's binary GCD algo - from wikipedia
|
||||
|
39
common/bswap.h
Normal file
39
common/bswap.h
Normal file
@ -0,0 +1,39 @@
|
||||
/*
|
||||
Copyright (C) 2010-2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _B_SWAP_H
|
||||
#define _B_SWAP_H
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
static inline quint32 swap32(quint32 val)
|
||||
{
|
||||
return (((val >> 24) & 0x000000FF) |
|
||||
((val >> 16) & 0x0000FF00) |
|
||||
((val << 16) & 0x00FF0000) |
|
||||
((val << 24) & 0xFF000000));
|
||||
}
|
||||
|
||||
static inline quint16 swap16(quint16 val)
|
||||
{
|
||||
return (((val >> 8) & 0x00FF) |
|
||||
((val << 8) & 0xFF00));
|
||||
}
|
||||
|
||||
#endif
|
@ -200,7 +200,10 @@ int HexDumpProtocol::protocolFrameSize(int streamIndex) const
|
||||
if (data.pad_until_end())
|
||||
{
|
||||
int pad = mpStream->frameLen(streamIndex)
|
||||
- (protocolFrameOffset(streamIndex) + len + kFcsSize);
|
||||
- (protocolFrameOffset(streamIndex)
|
||||
+ len
|
||||
+ protocolFramePayloadSize(streamIndex)
|
||||
+ kFcsSize);
|
||||
if (pad < 0)
|
||||
pad = 0;
|
||||
len += pad;
|
||||
|
@ -38,7 +38,8 @@ PROTOS += \
|
||||
textproto.proto \
|
||||
userscript.proto \
|
||||
hexdump.proto \
|
||||
sample.proto
|
||||
sample.proto \
|
||||
sign.proto
|
||||
|
||||
HEADERS = \
|
||||
abstractprotocol.h \
|
||||
@ -77,6 +78,7 @@ HEADERS += \
|
||||
hexdump.h \
|
||||
payload.h \
|
||||
sample.h \
|
||||
sign.h \
|
||||
userscript.h
|
||||
|
||||
SOURCES = \
|
||||
@ -110,6 +112,7 @@ SOURCES += \
|
||||
hexdump.cpp \
|
||||
payload.cpp \
|
||||
sample.cpp \
|
||||
sign.cpp \
|
||||
userscript.cpp
|
||||
|
||||
QMAKE_DISTCLEAN += object_script.*
|
||||
|
@ -27,6 +27,7 @@ FORMS += \
|
||||
hexdump.ui \
|
||||
payload.ui \
|
||||
sample.ui \
|
||||
sign.ui \
|
||||
userscript.ui
|
||||
|
||||
PROTOS = \
|
||||
@ -79,6 +80,7 @@ HEADERS += \
|
||||
hexdumpconfig.h \
|
||||
payloadconfig.h \
|
||||
sampleconfig.h \
|
||||
signconfig.h \
|
||||
userscriptconfig.h
|
||||
|
||||
SOURCES += \
|
||||
@ -118,6 +120,7 @@ SOURCES += \
|
||||
hexdumpconfig.cpp \
|
||||
payloadconfig.cpp \
|
||||
sampleconfig.cpp \
|
||||
signconfig.cpp \
|
||||
userscriptconfig.cpp
|
||||
|
||||
SOURCES += \
|
||||
|
@ -68,7 +68,7 @@ int PayloadProtocol::protocolFrameSize(int streamIndex) const
|
||||
int len;
|
||||
|
||||
len = mpStream->frameLen(streamIndex) - protocolFrameOffset(streamIndex)
|
||||
- kFcsSize;
|
||||
- protocolFramePayloadSize(streamIndex) - kFcsSize;
|
||||
|
||||
if (len < 0)
|
||||
len = 0;
|
||||
|
@ -31,20 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
#include <QTemporaryFile>
|
||||
#include <QtGlobal>
|
||||
|
||||
static inline quint32 swap32(quint32 val)
|
||||
{
|
||||
return (((val >> 24) && 0x000000FF) |
|
||||
((val >> 16) && 0x0000FF00) |
|
||||
((val << 16) && 0x00FF0000) |
|
||||
((val << 24) && 0xFF000000));
|
||||
}
|
||||
|
||||
static inline quint16 swap16(quint16 val)
|
||||
{
|
||||
return (((val >> 8) && 0x00FF) |
|
||||
((val << 8) && 0xFF00));
|
||||
}
|
||||
|
||||
const quint32 kPcapFileMagic = 0xa1b2c3d4;
|
||||
const quint32 kPcapFileMagicSwapped = 0xd4c3b2a1;
|
||||
const quint16 kPcapFileVersionMajor = 2;
|
||||
|
@ -128,6 +128,7 @@ message Protocol {
|
||||
kSampleFieldNumber = 102;
|
||||
kUserScriptFieldNumber = 103;
|
||||
kHexDumpFieldNumber = 104;
|
||||
kSignFieldNumber = 105;
|
||||
|
||||
kEth2FieldNumber = 200;
|
||||
kDot3FieldNumber = 201;
|
||||
@ -204,6 +205,7 @@ message Port {
|
||||
optional bool is_exclusive_control = 6;
|
||||
optional TransmitMode transmit_mode = 7 [default = kSequentialTransmit];
|
||||
optional string user_name = 8;
|
||||
optional bool is_tracking_stream_stats = 9;
|
||||
}
|
||||
|
||||
message PortConfigList {
|
||||
@ -265,6 +267,29 @@ message PortStatsList {
|
||||
repeated PortStats port_stats = 1;
|
||||
}
|
||||
|
||||
message StreamGuid {
|
||||
required uint32 id = 1;
|
||||
}
|
||||
|
||||
message StreamGuidList {
|
||||
required PortIdList port_id_list = 1;
|
||||
repeated StreamGuid stream_guid = 2;
|
||||
}
|
||||
|
||||
message StreamStats {
|
||||
required PortId port_id = 1;
|
||||
required StreamGuid stream_guid = 2;
|
||||
|
||||
optional uint64 rx_pkts = 11;
|
||||
optional uint64 rx_bytes = 12;
|
||||
optional uint64 tx_pkts = 13;
|
||||
optional uint64 tx_bytes = 14;
|
||||
}
|
||||
|
||||
message StreamStatsList {
|
||||
repeated StreamStats stream_stats = 1;
|
||||
}
|
||||
|
||||
enum NotifType {
|
||||
portConfigChanged = 1;
|
||||
}
|
||||
@ -358,5 +383,11 @@ service OstService {
|
||||
rpc resolveDeviceNeighbors(PortIdList) returns (Ack);
|
||||
rpc clearDeviceNeighbors(PortIdList) returns (Ack);
|
||||
rpc getDeviceNeighbors(PortId) returns (PortNeighborList);
|
||||
|
||||
// Stream Stats
|
||||
rpc getStreamStats(StreamGuidList) returns (StreamStatsList);
|
||||
rpc clearStreamStats(StreamGuidList) returns (Ack);
|
||||
|
||||
// XXX: Add new RPCs at the end only to preserve backward compatibility
|
||||
}
|
||||
|
||||
|
@ -59,6 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
#include "hexdump.h"
|
||||
#include "payload.h"
|
||||
#include "sample.h"
|
||||
#include "sign.h"
|
||||
#include "userscript.h"
|
||||
|
||||
ProtocolManager *OstProtocolManager;
|
||||
@ -133,6 +134,8 @@ ProtocolManager::ProtocolManager()
|
||||
(void*) PayloadProtocol::createInstance);
|
||||
registerProtocol(OstProto::Protocol::kSampleFieldNumber,
|
||||
(void*) SampleProtocol::createInstance);
|
||||
registerProtocol(OstProto::Protocol::kSignFieldNumber,
|
||||
(void*) SignProtocol::createInstance);
|
||||
registerProtocol(OstProto::Protocol::kUserScriptFieldNumber,
|
||||
(void*) UserScriptProtocol::createInstance);
|
||||
|
||||
|
@ -51,6 +51,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
#include "hexdumpconfig.h"
|
||||
#include "payloadconfig.h"
|
||||
#include "sampleconfig.h"
|
||||
#include "signconfig.h"
|
||||
#include "userscriptconfig.h"
|
||||
|
||||
ProtocolWidgetFactory *OstProtocolWidgetFactory;
|
||||
@ -154,6 +155,9 @@ ProtocolWidgetFactory::ProtocolWidgetFactory()
|
||||
OstProtocolWidgetFactory->registerProtocolConfigWidget(
|
||||
OstProto::Protocol::kSampleFieldNumber,
|
||||
(void*) SampleConfigForm::createInstance);
|
||||
OstProtocolWidgetFactory->registerProtocolConfigWidget(
|
||||
OstProto::Protocol::kSignFieldNumber,
|
||||
(void*) SignConfigForm::createInstance);
|
||||
OstProtocolWidgetFactory->registerProtocolConfigWidget(
|
||||
OstProto::Protocol::kUserScriptFieldNumber,
|
||||
(void*) UserScriptConfigForm::createInstance);
|
||||
|
219
common/sign.cpp
Normal file
219
common/sign.cpp
Normal file
@ -0,0 +1,219 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#include "sign.h"
|
||||
|
||||
SignProtocol::SignProtocol(StreamBase *stream, AbstractProtocol *parent)
|
||||
: AbstractProtocol(stream, parent)
|
||||
{
|
||||
}
|
||||
|
||||
SignProtocol::~SignProtocol()
|
||||
{
|
||||
}
|
||||
|
||||
AbstractProtocol* SignProtocol::createInstance(StreamBase *stream,
|
||||
AbstractProtocol *parent)
|
||||
{
|
||||
return new SignProtocol(stream, parent);
|
||||
}
|
||||
|
||||
quint32 SignProtocol::protocolNumber() const
|
||||
{
|
||||
return OstProto::Protocol::kSignFieldNumber;
|
||||
}
|
||||
|
||||
void SignProtocol::protoDataCopyInto(OstProto::Protocol &protocol) const
|
||||
{
|
||||
protocol.MutableExtension(OstProto::sign)->CopyFrom(data);
|
||||
protocol.mutable_protocol_id()->set_id(protocolNumber());
|
||||
}
|
||||
|
||||
void SignProtocol::protoDataCopyFrom(const OstProto::Protocol &protocol)
|
||||
{
|
||||
if (protocol.protocol_id().id() == protocolNumber() &&
|
||||
protocol.HasExtension(OstProto::sign))
|
||||
data.MergeFrom(protocol.GetExtension(OstProto::sign));
|
||||
}
|
||||
|
||||
QString SignProtocol::name() const
|
||||
{
|
||||
return QString("Signature");
|
||||
}
|
||||
|
||||
QString SignProtocol::shortName() const
|
||||
{
|
||||
return QString("SIGN");
|
||||
}
|
||||
|
||||
int SignProtocol::fieldCount() const
|
||||
{
|
||||
return sign_fieldCount;
|
||||
}
|
||||
|
||||
AbstractProtocol::FieldFlags SignProtocol::fieldFlags(int index) const
|
||||
{
|
||||
AbstractProtocol::FieldFlags flags;
|
||||
|
||||
flags = AbstractProtocol::fieldFlags(index);
|
||||
|
||||
switch (index)
|
||||
{
|
||||
case sign_magic:
|
||||
case sign_tlv_guid:
|
||||
case sign_tlv_end:
|
||||
break;
|
||||
|
||||
default:
|
||||
qFatal("%s: unimplemented case %d in switch", __PRETTY_FUNCTION__,
|
||||
index);
|
||||
break;
|
||||
}
|
||||
|
||||
return flags;
|
||||
}
|
||||
|
||||
QVariant SignProtocol::fieldData(int index, FieldAttrib attrib,
|
||||
int streamIndex) const
|
||||
{
|
||||
switch (index)
|
||||
{
|
||||
case sign_magic:
|
||||
{
|
||||
switch(attrib)
|
||||
{
|
||||
case FieldName:
|
||||
return QString("Magic");
|
||||
case FieldValue:
|
||||
return kSignMagic;
|
||||
case FieldTextValue:
|
||||
return QString("%1").arg(kSignMagic);
|
||||
case FieldFrameValue:
|
||||
{
|
||||
QByteArray fv;
|
||||
fv.resize(4);
|
||||
qToBigEndian(kSignMagic, (uchar*) fv.data());
|
||||
return fv;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case sign_tlv_guid:
|
||||
{
|
||||
quint32 guid = data.stream_guid() & 0xFFFFFF;
|
||||
switch(attrib)
|
||||
{
|
||||
case FieldName:
|
||||
return QString("Stream GUID");
|
||||
case FieldValue:
|
||||
return guid;
|
||||
case FieldTextValue:
|
||||
return QString("%1").arg(guid);
|
||||
case FieldFrameValue:
|
||||
{
|
||||
QByteArray fv;
|
||||
fv.resize(4);
|
||||
fv[0] = (guid >> 16) & 0xff;
|
||||
fv[1] = (guid >> 8) & 0xff;
|
||||
fv[2] = (guid >> 0) & 0xff;
|
||||
fv[3] = kTypeLenGuid;
|
||||
return fv;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case sign_tlv_end:
|
||||
{
|
||||
switch(attrib)
|
||||
{
|
||||
case FieldName:
|
||||
return QString("End TLV");
|
||||
case FieldValue:
|
||||
return 0;
|
||||
case FieldTextValue:
|
||||
return QString("NA");
|
||||
case FieldFrameValue:
|
||||
return QByteArray(1, kTypeLenEnd);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
qFatal("%s: unimplemented case %d in switch", __PRETTY_FUNCTION__,
|
||||
index);
|
||||
break;
|
||||
}
|
||||
|
||||
return AbstractProtocol::fieldData(index, attrib, streamIndex);
|
||||
}
|
||||
|
||||
bool SignProtocol::setFieldData(int index, const QVariant &value,
|
||||
FieldAttrib attrib)
|
||||
{
|
||||
bool isOk = false;
|
||||
|
||||
if (attrib != FieldValue)
|
||||
goto _exit;
|
||||
|
||||
switch (index)
|
||||
{
|
||||
case sign_tlv_guid:
|
||||
{
|
||||
uint guid = value.toUInt(&isOk);
|
||||
if (isOk)
|
||||
data.set_stream_guid(guid & 0xFFFFFF);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
qFatal("%s: unimplemented case %d in switch", __PRETTY_FUNCTION__,
|
||||
index);
|
||||
break;
|
||||
}
|
||||
|
||||
_exit:
|
||||
return isOk;
|
||||
}
|
||||
|
||||
quint32 SignProtocol::magic()
|
||||
{
|
||||
return kSignMagic;
|
||||
}
|
||||
|
||||
bool SignProtocol::packetGuid(const uchar *pkt, int pktLen, uint *guid)
|
||||
{
|
||||
const uchar *p = pkt + pktLen - sizeof(kSignMagic);
|
||||
quint32 magic = qFromBigEndian<quint32>(p);
|
||||
if (magic != kSignMagic)
|
||||
return false;
|
||||
|
||||
p--;
|
||||
while (*p != kTypeLenEnd) {
|
||||
if (*p == kTypeLenGuid) {
|
||||
*guid = qFromBigEndian<quint32>(p - 3) >> 8;
|
||||
return true;
|
||||
}
|
||||
p -= 1 + (*p >> 5); // move to next TLV
|
||||
}
|
||||
return false;
|
||||
}
|
93
common/sign.h
Normal file
93
common/sign.h
Normal file
@ -0,0 +1,93 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _SIGN_H
|
||||
#define _SIGN_H
|
||||
|
||||
#include "abstractprotocol.h"
|
||||
#include "sign.pb.h"
|
||||
|
||||
/*
|
||||
Sign Protocol is expected at the end of the frame (just before the Eth FCS)
|
||||
---+--------+-------+
|
||||
. . .| TLV(s) | Magic |
|
||||
| (8+) | (32) |
|
||||
---+--------+-------+
|
||||
Figures in brackets represent field width in bits
|
||||
|
||||
TLVs are encoded as
|
||||
+-------+-----+------+
|
||||
| Value | Len | Type |
|
||||
| (...) | (3) | (5) |
|
||||
+-------+-----+------+
|
||||
Len does NOT include the one byte of TypeLen
|
||||
Size of the value field varies between 0 to 7 bytes
|
||||
|
||||
Defined TLVs
|
||||
Type = 0, Len = 0 (0x00): End of TLVs
|
||||
Type = 1, Len = 3 (0x61): Stream GUID
|
||||
*/
|
||||
|
||||
class SignProtocol : public AbstractProtocol
|
||||
{
|
||||
public:
|
||||
enum samplefield
|
||||
{
|
||||
// Frame Fields
|
||||
sign_tlv_end = 0,
|
||||
sign_tlv_guid,
|
||||
sign_magic,
|
||||
|
||||
// Meta Fields
|
||||
// - None
|
||||
|
||||
sign_fieldCount
|
||||
};
|
||||
|
||||
SignProtocol(StreamBase *stream, AbstractProtocol *parent = 0);
|
||||
virtual ~SignProtocol();
|
||||
|
||||
static AbstractProtocol* createInstance(StreamBase *stream,
|
||||
AbstractProtocol *parent = 0);
|
||||
virtual quint32 protocolNumber() const;
|
||||
|
||||
virtual void protoDataCopyInto(OstProto::Protocol &protocol) const;
|
||||
virtual void protoDataCopyFrom(const OstProto::Protocol &protocol);
|
||||
|
||||
virtual QString name() const;
|
||||
virtual QString shortName() const;
|
||||
|
||||
virtual int fieldCount() const;
|
||||
|
||||
virtual AbstractProtocol::FieldFlags fieldFlags(int index) const;
|
||||
virtual QVariant fieldData(int index, FieldAttrib attrib,
|
||||
int streamIndex = 0) const;
|
||||
virtual bool setFieldData(int index, const QVariant &value,
|
||||
FieldAttrib attrib = FieldValue);
|
||||
|
||||
static quint32 magic();
|
||||
static bool packetGuid(const uchar *pkt, int pktLen, uint *guid);
|
||||
private:
|
||||
static const quint32 kSignMagic = 0x1d10c0da; // coda! (unicode - 0x1d10c)
|
||||
static const quint8 kTypeLenEnd = 0x00;
|
||||
static const quint8 kTypeLenGuid = 0x61;
|
||||
OstProto::Sign data;
|
||||
};
|
||||
|
||||
#endif
|
31
common/sign.proto
Normal file
31
common/sign.proto
Normal file
@ -0,0 +1,31 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
import "protocol.proto";
|
||||
|
||||
package OstProto;
|
||||
|
||||
// Sign Protocol
|
||||
message Sign {
|
||||
optional uint32 stream_guid = 1;
|
||||
}
|
||||
|
||||
extend Protocol {
|
||||
optional Sign sign = 105;
|
||||
}
|
59
common/sign.ui
Normal file
59
common/sign.ui
Normal file
@ -0,0 +1,59 @@
|
||||
<ui version="4.0" >
|
||||
<class>Sign</class>
|
||||
<widget class="QWidget" name="Sign" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>64</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" >
|
||||
<item row="0" column="0" >
|
||||
<widget class="QLabel" name="label" >
|
||||
<property name="text" >
|
||||
<string>Stream GUID</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>guid</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" >
|
||||
<widget class="QLineEdit" name="guid" />
|
||||
</item>
|
||||
<item row="0" column="2" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="1" column="1" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
53
common/signconfig.cpp
Normal file
53
common/signconfig.cpp
Normal file
@ -0,0 +1,53 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#include "signconfig.h"
|
||||
#include "sign.h"
|
||||
|
||||
SignConfigForm::SignConfigForm(QWidget *parent)
|
||||
: AbstractProtocolConfigForm(parent)
|
||||
{
|
||||
setupUi(this);
|
||||
}
|
||||
|
||||
SignConfigForm::~SignConfigForm()
|
||||
{
|
||||
}
|
||||
|
||||
SignConfigForm* SignConfigForm::createInstance()
|
||||
{
|
||||
return new SignConfigForm;
|
||||
}
|
||||
|
||||
void SignConfigForm::loadWidget(AbstractProtocol *proto)
|
||||
{
|
||||
guid->setText(
|
||||
proto->fieldData(
|
||||
SignProtocol::sign_tlv_guid,
|
||||
AbstractProtocol::FieldValue
|
||||
).toString());
|
||||
}
|
||||
|
||||
void SignConfigForm::storeWidget(AbstractProtocol *proto)
|
||||
{
|
||||
proto->setFieldData(
|
||||
SignProtocol::sign_tlv_guid,
|
||||
guid->text());
|
||||
}
|
||||
|
43
common/signconfig.h
Normal file
43
common/signconfig.h
Normal file
@ -0,0 +1,43 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _SIGN_CONFIG_H
|
||||
#define _SIGN_CONFIG_H
|
||||
|
||||
#include "abstractprotocolconfig.h"
|
||||
#include "ui_sign.h"
|
||||
|
||||
class SignConfigForm :
|
||||
public AbstractProtocolConfigForm,
|
||||
private Ui::Sign
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
SignConfigForm(QWidget *parent = 0);
|
||||
virtual ~SignConfigForm();
|
||||
|
||||
static SignConfigForm* createInstance();
|
||||
|
||||
virtual void loadWidget(AbstractProtocol *proto);
|
||||
virtual void storeWidget(AbstractProtocol *proto);
|
||||
|
||||
private slots:
|
||||
};
|
||||
|
||||
#endif
|
@ -140,6 +140,15 @@ void StreamBase::setFrameProtocol(ProtocolList protocolList)
|
||||
}
|
||||
#endif
|
||||
|
||||
bool StreamBase::hasProtocol(quint32 protocolNumber)
|
||||
{
|
||||
foreach(const AbstractProtocol *proto, *currentFrameProtocols)
|
||||
if (proto->protocolNumber() == protocolNumber)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
ProtocolListIterator* StreamBase::createProtocolListIterator() const
|
||||
{
|
||||
return new ProtocolListIterator(*currentFrameProtocols);
|
||||
@ -581,32 +590,45 @@ quint64 StreamBase::neighborMacAddress(int frameIndex) const
|
||||
return getNeighborMacAddress(portId_, int(mStreamId->id()), frameIndex);
|
||||
}
|
||||
|
||||
/*!
|
||||
Checks for any potential errors with the packets generated by this
|
||||
stream. Returns true if no problems are found, false otherwise. Details
|
||||
of the error(s) are available in the INOUT param result
|
||||
|
||||
All errors found are returned. However, each type of error is reported
|
||||
only once, even if multiple packets may have that error.
|
||||
*/
|
||||
bool StreamBase::preflightCheck(QStringList &result) const
|
||||
{
|
||||
bool pass = true;
|
||||
bool chkTrunc = true;
|
||||
bool chkJumbo = true;
|
||||
int count = isFrameSizeVariable() ? frameCount() : 1;
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
if (frameLen(i) < (frameProtocolLength(i) + kFcsSize))
|
||||
int pktLen = frameLen(i);
|
||||
|
||||
if (chkTrunc && (pktLen < (frameProtocolLength(i) + kFcsSize)))
|
||||
{
|
||||
result << QObject::tr("One or more frames may be truncated - "
|
||||
"frame length should be at least %1")
|
||||
.arg(frameProtocolLength(i) + kFcsSize);
|
||||
chkTrunc = false;
|
||||
pass = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
if (frameLen(i) > 1522)
|
||||
if (chkJumbo && (pktLen > 1522))
|
||||
{
|
||||
result << QObject::tr("Jumbo frames may be truncated or dropped "
|
||||
"if not supported by the hardware");
|
||||
pass = false;
|
||||
break;
|
||||
}
|
||||
|
||||
// Break out of loop if we've seen at least one instance of all
|
||||
// the above errors
|
||||
if (!chkTrunc && !chkJumbo)
|
||||
break;
|
||||
}
|
||||
|
||||
if (frameCount() <= averagePacketRate() && nextWhat() != e_nw_goto_id)
|
||||
|
@ -40,6 +40,7 @@ public:
|
||||
void protoDataCopyFrom(const OstProto::Stream &stream);
|
||||
void protoDataCopyInto(OstProto::Stream &stream) const;
|
||||
|
||||
bool hasProtocol(quint32 protocolNumber);
|
||||
ProtocolListIterator* createProtocolListIterator() const;
|
||||
|
||||
//! \todo (LOW) should we have a copy constructor??
|
||||
|
5
ost.pro
5
ost.pro
@ -1,5 +1,5 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = client server ostproto ostprotogui rpc binding extra
|
||||
SUBDIRS = client server ostproto ostprotogui rpc extra
|
||||
|
||||
client.target = client
|
||||
client.file = client/ostinato.pro
|
||||
@ -15,6 +15,3 @@ ostprotogui.file = common/ostprotogui.pro
|
||||
ostprotogui.depends = extra
|
||||
|
||||
rpc.file = rpc/pbrpc.pro
|
||||
|
||||
binding.target = binding
|
||||
binding.depends = ostproto
|
||||
|
11
protobuf.pri
11
protobuf.pri
@ -20,8 +20,7 @@ for(p, PROTOPATH):PROTOPATHS += --proto_path=$${p}
|
||||
protobuf_decl.name = protobuf header
|
||||
protobuf_decl.input = PROTOS
|
||||
protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h
|
||||
#protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} ${QMAKE_FILE_NAME}
|
||||
protobuf_decl.commands = protoc --cpp_out="." --python_out="../binding/protocols" $${PROTOPATHS} ${QMAKE_FILE_NAME}
|
||||
protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} ${QMAKE_FILE_NAME}
|
||||
protobuf_decl.variable_out = GENERATED_FILES
|
||||
QMAKE_EXTRA_COMPILERS += protobuf_decl
|
||||
|
||||
@ -32,11 +31,3 @@ protobuf_impl.depends = ${QMAKE_FILE_BASE}.pb.h
|
||||
protobuf_impl.commands = $$escape_expand(\\n)
|
||||
protobuf_impl.variable_out = GENERATED_SOURCES
|
||||
QMAKE_EXTRA_COMPILERS += protobuf_impl
|
||||
|
||||
protobuf_py.name = protobuf python binding
|
||||
protobuf_py.input = PROTOS
|
||||
protobuf_py.output = ../binding/protocols/${QMAKE_FILE_BASE}_pb2.py
|
||||
protobuf_py.commands = $$escape_expand(\\n)
|
||||
#protobuf_py.commands = protoc --python_out="../binding/protocols" $${PROTOPATHS} ${QMAKE_FILE_NAME}
|
||||
protobuf_py.variable_out = GENERATED_FILES
|
||||
QMAKE_EXTRA_COMPILERS += protobuf_py
|
||||
|
@ -65,6 +65,29 @@ void AbstractPort::init()
|
||||
{
|
||||
}
|
||||
|
||||
/*! Can we modify Port with these params? Should modify cause port dirty? */
|
||||
bool AbstractPort::canModify(const OstProto::Port &port, bool *dirty)
|
||||
{
|
||||
bool allow = true;
|
||||
|
||||
*dirty = false;
|
||||
|
||||
if (port.has_transmit_mode()
|
||||
&& (port.transmit_mode() != data_.transmit_mode())) {
|
||||
*dirty = true;
|
||||
allow = !isTransmitOn();
|
||||
}
|
||||
|
||||
if (port.has_is_tracking_stream_stats()
|
||||
&& (port.is_tracking_stream_stats()
|
||||
!= data_.is_tracking_stream_stats())) {
|
||||
*dirty = true;
|
||||
allow = !isTransmitOn();
|
||||
}
|
||||
|
||||
return allow;
|
||||
}
|
||||
|
||||
bool AbstractPort::modify(const OstProto::Port &port)
|
||||
{
|
||||
bool ret = true;
|
||||
@ -82,6 +105,9 @@ bool AbstractPort::modify(const OstProto::Port &port)
|
||||
if (port.has_transmit_mode())
|
||||
data_.set_transmit_mode(port.transmit_mode());
|
||||
|
||||
if (port.has_is_tracking_stream_stats())
|
||||
ret |= setTrackStreamStats(port.is_tracking_stream_stats());
|
||||
|
||||
if (port.has_user_name()) {
|
||||
data_.set_user_name(port.user_name());
|
||||
}
|
||||
@ -155,6 +181,13 @@ void AbstractPort::addNote(QString note)
|
||||
data_.set_notes(notes.toStdString());
|
||||
}
|
||||
|
||||
bool AbstractPort::setTrackStreamStats(bool enable)
|
||||
{
|
||||
data_.set_is_tracking_stream_stats(enable);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
AbstractPort::Accuracy AbstractPort::rateAccuracy()
|
||||
{
|
||||
return rateAccuracy_;
|
||||
@ -622,6 +655,54 @@ void AbstractPort::stats(PortStats *stats)
|
||||
stats_.rxFrameErrors + (maxStatsValue_ - epochStats_.rxFrameErrors);
|
||||
}
|
||||
|
||||
void AbstractPort::streamStats(uint guid, OstProto::StreamStatsList *stats)
|
||||
{
|
||||
if (streamStats_.contains(guid))
|
||||
{
|
||||
StreamStatsTuple sst = streamStats_.value(guid);
|
||||
OstProto::StreamStats *s = stats->add_stream_stats();
|
||||
|
||||
s->mutable_stream_guid()->set_id(guid);
|
||||
s->mutable_port_id()->set_id(id());
|
||||
|
||||
s->set_tx_pkts(sst.tx_pkts);
|
||||
s->set_tx_bytes(sst.tx_bytes);
|
||||
s->set_rx_pkts(sst.rx_pkts);
|
||||
s->set_rx_bytes(sst.rx_bytes);
|
||||
}
|
||||
}
|
||||
|
||||
void AbstractPort::streamStatsAll(OstProto::StreamStatsList *stats)
|
||||
{
|
||||
// FIXME: change input param to a non-OstProto type and/or have
|
||||
// a getFirst/Next like API?
|
||||
StreamStatsIterator i(streamStats_);
|
||||
while (i.hasNext())
|
||||
{
|
||||
i.next();
|
||||
StreamStatsTuple sst = i.value();
|
||||
OstProto::StreamStats *s = stats->add_stream_stats();
|
||||
|
||||
s->mutable_stream_guid()->set_id(i.key());
|
||||
s->mutable_port_id()->set_id(id());
|
||||
|
||||
s->set_tx_pkts(sst.tx_pkts);
|
||||
s->set_tx_bytes(sst.tx_bytes);
|
||||
s->set_rx_pkts(sst.rx_pkts);
|
||||
s->set_rx_bytes(sst.rx_bytes);
|
||||
}
|
||||
}
|
||||
|
||||
void AbstractPort::resetStreamStats(uint guid)
|
||||
{
|
||||
streamStats_.remove(guid);
|
||||
}
|
||||
|
||||
void AbstractPort::resetStreamStatsAll()
|
||||
{
|
||||
streamStats_.clear();
|
||||
}
|
||||
|
||||
void AbstractPort::clearDeviceNeighbors()
|
||||
{
|
||||
deviceManager_->clearDeviceNeighbors();
|
||||
|
@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
#ifndef _SERVER_ABSTRACT_PORT_H
|
||||
#define _SERVER_ABSTRACT_PORT_H
|
||||
|
||||
#include "streamstats.h"
|
||||
|
||||
#include <QList>
|
||||
#include <QtGlobal>
|
||||
|
||||
@ -72,6 +74,7 @@ public:
|
||||
const char* name() { return data_.name().c_str(); }
|
||||
void protoDataCopyInto(OstProto::Port *port) { port->CopyFrom(data_); }
|
||||
|
||||
bool canModify(const OstProto::Port &port, bool *dirty);
|
||||
bool modify(const OstProto::Port &port);
|
||||
|
||||
virtual OstProto::LinkState linkState() { return linkState_; }
|
||||
@ -87,6 +90,8 @@ public:
|
||||
bool isDirty() { return isSendQueueDirty_; }
|
||||
void setDirty() { isSendQueueDirty_ = true; }
|
||||
|
||||
virtual bool setTrackStreamStats(bool enable);
|
||||
|
||||
Accuracy rateAccuracy();
|
||||
virtual bool setRateAccuracy(Accuracy accuracy);
|
||||
|
||||
@ -111,6 +116,12 @@ public:
|
||||
void stats(PortStats *stats);
|
||||
void resetStats() { epochStats_ = stats_; }
|
||||
|
||||
// FIXME: combine single and All calls?
|
||||
void streamStats(uint guid, OstProto::StreamStatsList *stats);
|
||||
void streamStatsAll(OstProto::StreamStatsList *stats);
|
||||
void resetStreamStats(uint guid);
|
||||
void resetStreamStatsAll();
|
||||
|
||||
DeviceManager* deviceManager();
|
||||
virtual void startDeviceEmulation() = 0;
|
||||
virtual void stopDeviceEmulation() = 0;
|
||||
@ -123,6 +134,7 @@ public:
|
||||
quint64 neighborMacAddress(int streamId, int frameIndex);
|
||||
|
||||
protected:
|
||||
|
||||
void addNote(QString note);
|
||||
|
||||
void updatePacketListSequential();
|
||||
@ -136,6 +148,7 @@ protected:
|
||||
|
||||
quint64 maxStatsValue_;
|
||||
struct PortStats stats_;
|
||||
StreamStats streamStats_;
|
||||
//! \todo Need lock for stats access/update
|
||||
|
||||
DeviceManager *deviceManager_;
|
||||
|
@ -31,6 +31,7 @@ win32 {
|
||||
LIBS += -lm
|
||||
LIBS += -lprotobuf
|
||||
HEADERS += drone.h \
|
||||
pcaptransmitter.h \
|
||||
myservice.h
|
||||
SOURCES += \
|
||||
devicemanager.cpp \
|
||||
@ -40,6 +41,10 @@ SOURCES += \
|
||||
portmanager.cpp \
|
||||
abstractport.cpp \
|
||||
pcapport.cpp \
|
||||
pcaptransmitter.cpp \
|
||||
pcaprxstats.cpp \
|
||||
pcaptxstats.cpp \
|
||||
pcaptxthread.cpp \
|
||||
bsdport.cpp \
|
||||
linuxport.cpp \
|
||||
winpcapport.cpp
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
Copyright (C) 2010-2015 Srivats P.
|
||||
Copyright (C) 2010-2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
@ -133,10 +133,20 @@ void MyService::modifyPort(::google::protobuf::RpcController* /*controller*/,
|
||||
id = port.port_id().id();
|
||||
if (id < portInfo.size())
|
||||
{
|
||||
bool dirty;
|
||||
|
||||
if (!portInfo[id]->canModify(port, &dirty)) {
|
||||
qDebug("Port %d cannot be modified - stop tx and retry", id);
|
||||
continue; //! \todo(LOW): Partial status of RPC
|
||||
}
|
||||
|
||||
portLock[id]->lockForWrite();
|
||||
portInfo[id]->modify(port);
|
||||
if (dirty)
|
||||
portInfo[id]->updatePacketList();
|
||||
portLock[id]->unlock();
|
||||
|
||||
|
||||
notif->mutable_port_id_list()->add_port_id()->set_id(id);
|
||||
}
|
||||
}
|
||||
@ -148,6 +158,8 @@ void MyService::modifyPort(::google::protobuf::RpcController* /*controller*/,
|
||||
notif->set_notif_type(OstProto::portConfigChanged);
|
||||
emit notification(notif->notif_type(), SharedProtobufMessage(notif));
|
||||
}
|
||||
else
|
||||
delete notif;
|
||||
}
|
||||
|
||||
void MyService::getStreamIdList(::google::protobuf::RpcController* controller,
|
||||
@ -558,6 +570,66 @@ void MyService::clearStats(::google::protobuf::RpcController* /*controller*/,
|
||||
done->Run();
|
||||
}
|
||||
|
||||
void MyService::getStreamStats(
|
||||
::google::protobuf::RpcController* /*controller*/,
|
||||
const ::OstProto::StreamGuidList* request,
|
||||
::OstProto::StreamStatsList* response,
|
||||
::google::protobuf::Closure* done)
|
||||
{
|
||||
qDebug("In %s", __PRETTY_FUNCTION__);
|
||||
|
||||
for (int i = 0; i < request->port_id_list().port_id_size(); i++)
|
||||
{
|
||||
int portId;
|
||||
|
||||
portId = request->port_id_list().port_id(i).id();
|
||||
if ((portId < 0) || (portId >= portInfo.size()))
|
||||
continue; //! \todo(LOW): partial rpc?
|
||||
|
||||
portLock[portId]->lockForRead();
|
||||
if (request->stream_guid_size())
|
||||
for (int j = 0; j < request->stream_guid_size(); j++)
|
||||
portInfo[portId]->streamStats(request->stream_guid(j).id(),
|
||||
response);
|
||||
else
|
||||
portInfo[portId]->streamStatsAll(response);
|
||||
portLock[portId]->unlock();
|
||||
}
|
||||
|
||||
done->Run();
|
||||
}
|
||||
|
||||
void MyService::clearStreamStats(
|
||||
::google::protobuf::RpcController* /*controller*/,
|
||||
const ::OstProto::StreamGuidList* request,
|
||||
::OstProto::Ack* /*response*/,
|
||||
::google::protobuf::Closure* done)
|
||||
{
|
||||
qDebug("In %s", __PRETTY_FUNCTION__);
|
||||
|
||||
for (int i = 0; i < request->port_id_list().port_id_size(); i++)
|
||||
{
|
||||
int portId;
|
||||
|
||||
portId = request->port_id_list().port_id(i).id();
|
||||
if ((portId < 0) || (portId >= portInfo.size()))
|
||||
continue; //! \todo (LOW): partial RPC?
|
||||
|
||||
portLock[portId]->lockForWrite();
|
||||
if (request->stream_guid_size())
|
||||
for (int j = 0; j < request->stream_guid_size(); j++)
|
||||
portInfo[portId]->resetStreamStats(
|
||||
request->stream_guid(j).id());
|
||||
else
|
||||
portInfo[portId]->resetStreamStatsAll();
|
||||
portLock[portId]->unlock();
|
||||
}
|
||||
|
||||
//! \todo (LOW): fill-in response "Ack"????
|
||||
|
||||
done->Run();
|
||||
}
|
||||
|
||||
void MyService::checkVersion(::google::protobuf::RpcController* controller,
|
||||
const ::OstProto::VersionInfo* request,
|
||||
::OstProto::VersionCompatibility* response,
|
||||
|
@ -100,6 +100,16 @@ public:
|
||||
const ::OstProto::PortIdList* request,
|
||||
::OstProto::Ack* response,
|
||||
::google::protobuf::Closure* done);
|
||||
|
||||
virtual void getStreamStats(::google::protobuf::RpcController* controller,
|
||||
const ::OstProto::StreamGuidList* request,
|
||||
::OstProto::StreamStatsList* response,
|
||||
::google::protobuf::Closure* done);
|
||||
virtual void clearStreamStats(::google::protobuf::RpcController* controller,
|
||||
const ::OstProto::StreamGuidList* request,
|
||||
::OstProto::Ack* response,
|
||||
::google::protobuf::Closure* done);
|
||||
|
||||
virtual void checkVersion(::google::protobuf::RpcController* controller,
|
||||
const ::OstProto::VersionInfo* request,
|
||||
::OstProto::VersionCompatibility* response,
|
||||
|
88
server/packetsequence.h
Normal file
88
server/packetsequence.h
Normal file
@ -0,0 +1,88 @@
|
||||
/*
|
||||
Copyright (C) 2010-2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _PACKET_SEQUENCE_H
|
||||
#define _PACKET_SEQUENCE_H
|
||||
|
||||
#include "pcapextra.h"
|
||||
#include "../common/sign.h"
|
||||
#include "streamstats.h"
|
||||
|
||||
class PacketSequence
|
||||
{
|
||||
public:
|
||||
PacketSequence(bool trackGuidStats) {
|
||||
trackGuidStats_ = trackGuidStats;
|
||||
sendQueue_ = pcap_sendqueue_alloc(1*1024*1024);
|
||||
lastPacket_ = NULL;
|
||||
packets_ = 0;
|
||||
bytes_ = 0;
|
||||
usecDuration_ = 0;
|
||||
repeatCount_ = 1;
|
||||
repeatSize_ = 1;
|
||||
usecDelay_ = 0;
|
||||
}
|
||||
~PacketSequence() {
|
||||
pcap_sendqueue_destroy(sendQueue_);
|
||||
}
|
||||
bool hasFreeSpace(int size) {
|
||||
if ((sendQueue_->len + size) <= sendQueue_->maxlen)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
int appendPacket(const struct pcap_pkthdr *pktHeader,
|
||||
const uchar *pktData) {
|
||||
int ret;
|
||||
if (lastPacket_)
|
||||
{
|
||||
usecDuration_ += (pktHeader->ts.tv_sec
|
||||
- lastPacket_->ts.tv_sec) * long(1e6);
|
||||
usecDuration_ += (pktHeader->ts.tv_usec
|
||||
- lastPacket_->ts.tv_usec);
|
||||
}
|
||||
packets_++;
|
||||
bytes_ += pktHeader->caplen;
|
||||
lastPacket_ = (struct pcap_pkthdr *)
|
||||
(sendQueue_->buffer + sendQueue_->len);
|
||||
ret = pcap_sendqueue_queue(sendQueue_, pktHeader, pktData);
|
||||
if (trackGuidStats_ && (ret >= 0)) {
|
||||
uint guid;
|
||||
if (SignProtocol::packetGuid(pktData, pktHeader->caplen, &guid)) {
|
||||
streamStatsMeta_[guid].tx_pkts++;
|
||||
streamStatsMeta_[guid].tx_bytes += pktHeader->caplen;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
pcap_send_queue *sendQueue_;
|
||||
struct pcap_pkthdr *lastPacket_;
|
||||
long packets_;
|
||||
long bytes_;
|
||||
ulong usecDuration_;
|
||||
int repeatCount_;
|
||||
int repeatSize_;
|
||||
long usecDelay_;
|
||||
StreamStats streamStatsMeta_;
|
||||
|
||||
private:
|
||||
bool trackGuidStats_;
|
||||
};
|
||||
|
||||
#endif
|
@ -24,67 +24,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
pcap_if_t *PcapPort::deviceList_ = NULL;
|
||||
|
||||
|
||||
#if defined(Q_OS_LINUX)
|
||||
typedef struct timeval TimeStamp;
|
||||
static void inline getTimeStamp(TimeStamp *stamp)
|
||||
{
|
||||
gettimeofday(stamp, NULL);
|
||||
}
|
||||
|
||||
// Returns time diff in usecs between end and start
|
||||
static long inline udiffTimeStamp(const TimeStamp *start, const TimeStamp *end)
|
||||
{
|
||||
struct timeval diff;
|
||||
long usecs;
|
||||
|
||||
timersub(end, start, &diff);
|
||||
|
||||
usecs = diff.tv_usec;
|
||||
if (diff.tv_sec)
|
||||
usecs += diff.tv_sec*1e6;
|
||||
|
||||
return usecs;
|
||||
}
|
||||
#elif defined(Q_OS_WIN32)
|
||||
static quint64 gTicksFreq;
|
||||
typedef LARGE_INTEGER TimeStamp;
|
||||
static void inline getTimeStamp(TimeStamp* stamp)
|
||||
{
|
||||
QueryPerformanceCounter(stamp);
|
||||
}
|
||||
|
||||
static long inline udiffTimeStamp(const TimeStamp *start, const TimeStamp *end)
|
||||
{
|
||||
if (end->QuadPart >= start->QuadPart)
|
||||
return (end->QuadPart - start->QuadPart)*long(1e6)/gTicksFreq;
|
||||
else
|
||||
{
|
||||
// FIXME: incorrect! what's the max value for this counter before
|
||||
// it rolls over?
|
||||
return (start->QuadPart)*long(1e6)/gTicksFreq;
|
||||
}
|
||||
}
|
||||
#else
|
||||
typedef int TimeStamp;
|
||||
static void inline getTimeStamp(TimeStamp*) {}
|
||||
static long inline udiffTimeStamp(const TimeStamp*, const TimeStamp*) { return 0; }
|
||||
#endif
|
||||
|
||||
PcapPort::PcapPort(int id, const char *device)
|
||||
: AbstractPort(id, device)
|
||||
{
|
||||
monitorRx_ = new PortMonitor(device, kDirectionRx, &stats_);
|
||||
monitorTx_ = new PortMonitor(device, kDirectionTx, &stats_);
|
||||
transmitter_ = new PortTransmitter(device);
|
||||
transmitter_ = new PcapTransmitter(device, streamStats_);
|
||||
capturer_ = new PortCapturer(device);
|
||||
emulXcvr_ = new EmulationTransceiver(device, deviceManager_);
|
||||
rxStatsPoller_ = new PcapRxStats(device, streamStats_);
|
||||
|
||||
if (!monitorRx_->handle() || !monitorTx_->handle())
|
||||
isUsable_ = false;
|
||||
@ -133,6 +83,9 @@ PcapPort::~PcapPort()
|
||||
if (monitorTx_)
|
||||
monitorTx_->stop();
|
||||
|
||||
rxStatsPoller_->stop();
|
||||
delete rxStatsPoller_;
|
||||
|
||||
delete emulXcvr_;
|
||||
delete capturer_;
|
||||
delete transmitter_;
|
||||
@ -168,6 +121,16 @@ void PcapPort::updateNotes()
|
||||
arg(notes).toStdString());
|
||||
}
|
||||
|
||||
bool PcapPort::setTrackStreamStats(bool enable)
|
||||
{
|
||||
bool val = enable ? startStreamStatsTracking() : stopStreamStatsTracking();
|
||||
|
||||
if (val)
|
||||
AbstractPort::setTrackStreamStats(enable);
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
bool PcapPort::setRateAccuracy(AbstractPort::Accuracy accuracy)
|
||||
{
|
||||
if (transmitter_->setRateAccuracy(accuracy)) {
|
||||
@ -192,6 +155,44 @@ int PcapPort::sendEmulationPacket(PacketBuffer *pktBuf)
|
||||
return emulXcvr_->transmitPacket(pktBuf);
|
||||
}
|
||||
|
||||
bool PcapPort::startStreamStatsTracking()
|
||||
{
|
||||
if (!transmitter_->setStreamStatsTracking(true))
|
||||
goto _tx_fail;
|
||||
if (!rxStatsPoller_->start())
|
||||
goto _rx_fail;
|
||||
/*
|
||||
* If RxPoller receives both IN and OUT packets, packets Tx on this
|
||||
* port will also be received by it and we consider it to be a Rx (IN)
|
||||
* packet incorrectly - so adjust Rx stats for this case
|
||||
* XXX - ideally, RxPoller should do this adjustment, but given our
|
||||
* design, it is easier to implement in transmitter
|
||||
*/
|
||||
transmitter_->adjustRxStreamStats(!rxStatsPoller_->isDirectional());
|
||||
return true;
|
||||
|
||||
_rx_fail:
|
||||
transmitter_->setStreamStatsTracking(false);
|
||||
_tx_fail:
|
||||
qWarning("failed to start stream stats tracking");
|
||||
return false;
|
||||
}
|
||||
|
||||
bool PcapPort::stopStreamStatsTracking()
|
||||
{
|
||||
if (!transmitter_->setStreamStatsTracking(false))
|
||||
goto _tx_fail;
|
||||
if (!rxStatsPoller_->stop())
|
||||
goto _rx_fail;
|
||||
return true;
|
||||
|
||||
_rx_fail:
|
||||
transmitter_->setStreamStatsTracking(true);
|
||||
_tx_fail:
|
||||
qWarning("failed to stop stream stats tracking");
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* ------------------------------------------------------------------- *
|
||||
* Port Monitor
|
||||
@ -342,440 +343,6 @@ void PcapPort::PortMonitor::stop()
|
||||
pcap_breakloop(handle());
|
||||
}
|
||||
|
||||
/*
|
||||
* ------------------------------------------------------------------- *
|
||||
* Port Transmitter
|
||||
* ------------------------------------------------------------------- *
|
||||
*/
|
||||
PcapPort::PortTransmitter::PortTransmitter(const char *device)
|
||||
{
|
||||
char errbuf[PCAP_ERRBUF_SIZE] = "";
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
LARGE_INTEGER freq;
|
||||
if (QueryPerformanceFrequency(&freq))
|
||||
gTicksFreq = freq.QuadPart;
|
||||
else
|
||||
Q_ASSERT_X(false, "PortTransmitter::PortTransmitter",
|
||||
"This Win32 platform does not support performance counter");
|
||||
#endif
|
||||
state_ = kNotStarted;
|
||||
returnToQIdx_ = -1;
|
||||
loopDelay_ = 0;
|
||||
stop_ = false;
|
||||
stats_ = new AbstractPort::PortStats;
|
||||
usingInternalStats_ = true;
|
||||
handle_ = pcap_open_live(device, 64 /* FIXME */, 0, 1000 /* ms */, errbuf);
|
||||
|
||||
if (handle_ == NULL)
|
||||
goto _open_error;
|
||||
|
||||
usingInternalHandle_ = true;
|
||||
|
||||
return;
|
||||
|
||||
_open_error:
|
||||
qDebug("%s: Error opening port %s: %s\n", __FUNCTION__, device, errbuf);
|
||||
usingInternalHandle_ = false;
|
||||
}
|
||||
|
||||
PcapPort::PortTransmitter::~PortTransmitter()
|
||||
{
|
||||
if (usingInternalStats_)
|
||||
delete stats_;
|
||||
if (usingInternalHandle_)
|
||||
pcap_close(handle_);
|
||||
}
|
||||
|
||||
bool PcapPort::PortTransmitter::setRateAccuracy(
|
||||
AbstractPort::Accuracy accuracy)
|
||||
{
|
||||
switch (accuracy) {
|
||||
case kHighAccuracy:
|
||||
udelayFn_ = udelay;
|
||||
qWarning("%s: rate accuracy set to High - busy wait", __FUNCTION__);
|
||||
break;
|
||||
case kLowAccuracy:
|
||||
udelayFn_ = QThread::usleep;
|
||||
qWarning("%s: rate accuracy set to Low - usleep", __FUNCTION__);
|
||||
break;
|
||||
default:
|
||||
qWarning("%s: unsupported rate accuracy value %d", __FUNCTION__,
|
||||
accuracy);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void PcapPort::PortTransmitter::clearPacketList()
|
||||
{
|
||||
Q_ASSERT(!isRunning());
|
||||
// \todo lock for packetSequenceList
|
||||
while(packetSequenceList_.size())
|
||||
delete packetSequenceList_.takeFirst();
|
||||
|
||||
currentPacketSequence_ = NULL;
|
||||
repeatSequenceStart_ = -1;
|
||||
repeatSize_ = 0;
|
||||
packetCount_ = 0;
|
||||
|
||||
returnToQIdx_ = -1;
|
||||
|
||||
setPacketListLoopMode(false, 0, 0);
|
||||
}
|
||||
|
||||
void PcapPort::PortTransmitter::loopNextPacketSet(qint64 size, qint64 repeats,
|
||||
long repeatDelaySec, long repeatDelayNsec)
|
||||
{
|
||||
currentPacketSequence_ = new PacketSequence;
|
||||
currentPacketSequence_->repeatCount_ = repeats;
|
||||
currentPacketSequence_->usecDelay_ = repeatDelaySec * long(1e6)
|
||||
+ repeatDelayNsec/1000;
|
||||
|
||||
repeatSequenceStart_ = packetSequenceList_.size();
|
||||
repeatSize_ = size;
|
||||
packetCount_ = 0;
|
||||
|
||||
packetSequenceList_.append(currentPacketSequence_);
|
||||
}
|
||||
|
||||
bool PcapPort::PortTransmitter::appendToPacketList(long sec, long nsec,
|
||||
const uchar *packet, int length)
|
||||
{
|
||||
bool op = true;
|
||||
pcap_pkthdr pktHdr;
|
||||
|
||||
pktHdr.caplen = pktHdr.len = length;
|
||||
pktHdr.ts.tv_sec = sec;
|
||||
pktHdr.ts.tv_usec = nsec/1000;
|
||||
|
||||
if (currentPacketSequence_ == NULL ||
|
||||
!currentPacketSequence_->hasFreeSpace(2*sizeof(pcap_pkthdr)+length))
|
||||
{
|
||||
if (currentPacketSequence_ != NULL)
|
||||
{
|
||||
long usecs;
|
||||
|
||||
usecs = (pktHdr.ts.tv_sec
|
||||
- currentPacketSequence_->lastPacket_->ts.tv_sec)
|
||||
* long(1e6);
|
||||
usecs += (pktHdr.ts.tv_usec
|
||||
- currentPacketSequence_->lastPacket_->ts.tv_usec);
|
||||
currentPacketSequence_->usecDelay_ = usecs;
|
||||
}
|
||||
|
||||
//! \todo (LOW): calculate sendqueue size
|
||||
currentPacketSequence_ = new PacketSequence;
|
||||
|
||||
packetSequenceList_.append(currentPacketSequence_);
|
||||
|
||||
// Validate that the pkt will fit inside the new currentSendQueue_
|
||||
Q_ASSERT(currentPacketSequence_->hasFreeSpace(
|
||||
sizeof(pcap_pkthdr) + length));
|
||||
}
|
||||
|
||||
if (currentPacketSequence_->appendPacket(&pktHdr, (u_char*) packet) < 0)
|
||||
{
|
||||
op = false;
|
||||
}
|
||||
|
||||
packetCount_++;
|
||||
if (repeatSize_ > 0 && packetCount_ == repeatSize_)
|
||||
{
|
||||
qDebug("repeatSequenceStart_=%d, repeatSize_ = %llu",
|
||||
repeatSequenceStart_, repeatSize_);
|
||||
|
||||
// Set the packetSequence repeatSize
|
||||
Q_ASSERT(repeatSequenceStart_ >= 0);
|
||||
Q_ASSERT(repeatSequenceStart_ < packetSequenceList_.size());
|
||||
|
||||
if (currentPacketSequence_ != packetSequenceList_[repeatSequenceStart_])
|
||||
{
|
||||
PacketSequence *start = packetSequenceList_[repeatSequenceStart_];
|
||||
|
||||
currentPacketSequence_->usecDelay_ = start->usecDelay_;
|
||||
start->usecDelay_ = 0;
|
||||
start->repeatSize_ =
|
||||
packetSequenceList_.size() - repeatSequenceStart_;
|
||||
}
|
||||
|
||||
repeatSize_ = 0;
|
||||
|
||||
// End current pktSeq and trigger a new pktSeq allocation for next pkt
|
||||
currentPacketSequence_ = NULL;
|
||||
}
|
||||
|
||||
return op;
|
||||
}
|
||||
|
||||
void PcapPort::PortTransmitter::setHandle(pcap_t *handle)
|
||||
{
|
||||
if (usingInternalHandle_)
|
||||
pcap_close(handle_);
|
||||
handle_ = handle;
|
||||
usingInternalHandle_ = false;
|
||||
}
|
||||
|
||||
void PcapPort::PortTransmitter::useExternalStats(AbstractPort::PortStats *stats)
|
||||
{
|
||||
if (usingInternalStats_)
|
||||
delete stats_;
|
||||
stats_ = stats;
|
||||
usingInternalStats_ = false;
|
||||
}
|
||||
|
||||
void PcapPort::PortTransmitter::run()
|
||||
{
|
||||
//! \todo (MED) Stream Mode - continuous: define before implement
|
||||
|
||||
// NOTE1: We can't use pcap_sendqueue_transmit() directly even on Win32
|
||||
// 'coz of 2 reasons - there's no way of stopping it before all packets
|
||||
// in the sendQueue are sent out and secondly, stats are available only
|
||||
// when all packets have been sent - no periodic updates
|
||||
//
|
||||
// NOTE2: Transmit on the Rx Handle so that we can receive it back
|
||||
// on the Tx Handle to do stats
|
||||
//
|
||||
// NOTE3: Update pcapExtra counters - port TxStats will be updated in the
|
||||
// 'stats callback' function so that both Rx and Tx stats are updated
|
||||
// together
|
||||
|
||||
const int kSyncTransmit = 1;
|
||||
int i;
|
||||
long overHead = 0; // overHead should be negative or zero
|
||||
|
||||
qDebug("packetSequenceList_.size = %d", packetSequenceList_.size());
|
||||
if (packetSequenceList_.size() <= 0)
|
||||
goto _exit;
|
||||
|
||||
for(i = 0; i < packetSequenceList_.size(); i++) {
|
||||
qDebug("sendQ[%d]: rptCnt = %d, rptSz = %d, usecDelay = %ld", i,
|
||||
packetSequenceList_.at(i)->repeatCount_,
|
||||
packetSequenceList_.at(i)->repeatSize_,
|
||||
packetSequenceList_.at(i)->usecDelay_);
|
||||
qDebug("sendQ[%d]: pkts = %ld, usecDuration = %ld", i,
|
||||
packetSequenceList_.at(i)->packets_,
|
||||
packetSequenceList_.at(i)->usecDuration_);
|
||||
}
|
||||
|
||||
state_ = kRunning;
|
||||
i = 0;
|
||||
while (i < packetSequenceList_.size())
|
||||
{
|
||||
|
||||
_restart:
|
||||
int rptSz = packetSequenceList_.at(i)->repeatSize_;
|
||||
int rptCnt = packetSequenceList_.at(i)->repeatCount_;
|
||||
|
||||
for (int j = 0; j < rptCnt; j++)
|
||||
{
|
||||
for (int k = 0; k < rptSz; k++)
|
||||
{
|
||||
int ret;
|
||||
PacketSequence *seq = packetSequenceList_.at(i+k);
|
||||
#ifdef Q_OS_WIN32
|
||||
TimeStamp ovrStart, ovrEnd;
|
||||
|
||||
if (seq->usecDuration_ <= long(1e6)) // 1s
|
||||
{
|
||||
getTimeStamp(&ovrStart);
|
||||
ret = pcap_sendqueue_transmit(handle_,
|
||||
seq->sendQueue_, kSyncTransmit);
|
||||
if (ret >= 0)
|
||||
{
|
||||
stats_->txPkts += seq->packets_;
|
||||
stats_->txBytes += seq->bytes_;
|
||||
|
||||
getTimeStamp(&ovrEnd);
|
||||
overHead += seq->usecDuration_
|
||||
- udiffTimeStamp(&ovrStart, &ovrEnd);
|
||||
Q_ASSERT(overHead <= 0);
|
||||
}
|
||||
if (stop_)
|
||||
ret = -2;
|
||||
}
|
||||
else
|
||||
{
|
||||
ret = sendQueueTransmit(handle_, seq->sendQueue_,
|
||||
overHead, kSyncTransmit);
|
||||
}
|
||||
#else
|
||||
ret = sendQueueTransmit(handle_, seq->sendQueue_,
|
||||
overHead, kSyncTransmit);
|
||||
#endif
|
||||
|
||||
if (ret >= 0)
|
||||
{
|
||||
long usecs = seq->usecDelay_ + overHead;
|
||||
if (usecs > 0)
|
||||
{
|
||||
(*udelayFn_)(usecs);
|
||||
overHead = 0;
|
||||
}
|
||||
else
|
||||
overHead = usecs;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug("error %d in sendQueueTransmit()", ret);
|
||||
qDebug("overHead = %ld", overHead);
|
||||
stop_ = false;
|
||||
goto _exit;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Move to the next Packet Set
|
||||
i += rptSz;
|
||||
}
|
||||
|
||||
if (returnToQIdx_ >= 0)
|
||||
{
|
||||
long usecs = loopDelay_ + overHead;
|
||||
|
||||
if (usecs > 0)
|
||||
{
|
||||
(*udelayFn_)(usecs);
|
||||
overHead = 0;
|
||||
}
|
||||
else
|
||||
overHead = usecs;
|
||||
|
||||
i = returnToQIdx_;
|
||||
goto _restart;
|
||||
}
|
||||
|
||||
_exit:
|
||||
state_ = kFinished;
|
||||
}
|
||||
|
||||
void PcapPort::PortTransmitter::start()
|
||||
{
|
||||
// FIXME: return error
|
||||
if (state_ == kRunning) {
|
||||
qWarning("Transmit start requested but is already running!");
|
||||
return;
|
||||
}
|
||||
|
||||
state_ = kNotStarted;
|
||||
QThread::start();
|
||||
|
||||
while (state_ == kNotStarted)
|
||||
QThread::msleep(10);
|
||||
}
|
||||
|
||||
void PcapPort::PortTransmitter::stop()
|
||||
{
|
||||
if (state_ == kRunning) {
|
||||
stop_ = true;
|
||||
while (state_ == kRunning)
|
||||
QThread::msleep(10);
|
||||
}
|
||||
else {
|
||||
// FIXME: return error
|
||||
qWarning("Transmit stop requested but is not running!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
bool PcapPort::PortTransmitter::isRunning()
|
||||
{
|
||||
return (state_ == kRunning);
|
||||
}
|
||||
|
||||
int PcapPort::PortTransmitter::sendQueueTransmit(pcap_t *p,
|
||||
pcap_send_queue *queue, long &overHead, int sync)
|
||||
{
|
||||
TimeStamp ovrStart, ovrEnd;
|
||||
struct timeval ts;
|
||||
struct pcap_pkthdr *hdr = (struct pcap_pkthdr*) queue->buffer;
|
||||
char *end = queue->buffer + queue->len;
|
||||
|
||||
ts = hdr->ts;
|
||||
|
||||
getTimeStamp(&ovrStart);
|
||||
while((char*) hdr < end)
|
||||
{
|
||||
uchar *pkt = (uchar*)hdr + sizeof(*hdr);
|
||||
int pktLen = hdr->caplen;
|
||||
|
||||
if (sync)
|
||||
{
|
||||
long usec = (hdr->ts.tv_sec - ts.tv_sec) * 1000000 +
|
||||
(hdr->ts.tv_usec - ts.tv_usec);
|
||||
|
||||
getTimeStamp(&ovrEnd);
|
||||
|
||||
overHead -= udiffTimeStamp(&ovrStart, &ovrEnd);
|
||||
Q_ASSERT(overHead <= 0);
|
||||
usec += overHead;
|
||||
if (usec > 0)
|
||||
{
|
||||
(*udelayFn_)(usec);
|
||||
overHead = 0;
|
||||
}
|
||||
else
|
||||
overHead = usec;
|
||||
|
||||
ts = hdr->ts;
|
||||
getTimeStamp(&ovrStart);
|
||||
}
|
||||
|
||||
Q_ASSERT(pktLen > 0);
|
||||
|
||||
pcap_sendpacket(p, pkt, pktLen);
|
||||
stats_->txPkts++;
|
||||
stats_->txBytes += pktLen;
|
||||
|
||||
// Step to the next packet in the buffer
|
||||
hdr = (struct pcap_pkthdr*) (pkt + pktLen);
|
||||
pkt = (uchar*) ((uchar*)hdr + sizeof(*hdr));
|
||||
|
||||
if (stop_)
|
||||
{
|
||||
return -2;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void PcapPort::PortTransmitter::udelay(unsigned long usec)
|
||||
{
|
||||
#if defined(Q_OS_WIN32)
|
||||
LARGE_INTEGER tgtTicks;
|
||||
LARGE_INTEGER curTicks;
|
||||
|
||||
QueryPerformanceCounter(&curTicks);
|
||||
tgtTicks.QuadPart = curTicks.QuadPart + (usec*gTicksFreq)/1000000;
|
||||
|
||||
while (curTicks.QuadPart < tgtTicks.QuadPart)
|
||||
QueryPerformanceCounter(&curTicks);
|
||||
#elif defined(Q_OS_LINUX)
|
||||
struct timeval delay, target, now;
|
||||
|
||||
//qDebug("usec delay = %ld", usec);
|
||||
|
||||
delay.tv_sec = 0;
|
||||
delay.tv_usec = usec;
|
||||
|
||||
while (delay.tv_usec >= 1000000)
|
||||
{
|
||||
delay.tv_sec++;
|
||||
delay.tv_usec -= 1000000;
|
||||
}
|
||||
|
||||
gettimeofday(&now, NULL);
|
||||
timeradd(&now, &delay, &target);
|
||||
|
||||
do {
|
||||
gettimeofday(&now, NULL);
|
||||
} while (timercmp(&now, &target, <));
|
||||
#else
|
||||
QThread::usleep(usec);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
* ------------------------------------------------------------------- *
|
||||
* Port Capturer
|
||||
|
@ -26,6 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
|
||||
#include "abstractport.h"
|
||||
#include "pcapextra.h"
|
||||
#include "pcaprxstats.h"
|
||||
#include "pcaptransmitter.h"
|
||||
|
||||
class PcapPort : public AbstractPort
|
||||
{
|
||||
@ -38,6 +40,7 @@ public:
|
||||
virtual bool hasExclusiveControl() { return false; }
|
||||
virtual bool setExclusiveControl(bool /*exclusive*/) { return false; }
|
||||
|
||||
virtual bool setTrackStreamStats(bool enable);
|
||||
virtual bool setRateAccuracy(AbstractPort::Accuracy accuracy);
|
||||
|
||||
virtual void clearPacketList() {
|
||||
@ -103,107 +106,6 @@ protected:
|
||||
bool isPromisc_;
|
||||
};
|
||||
|
||||
class PortTransmitter: public QThread
|
||||
{
|
||||
public:
|
||||
PortTransmitter(const char *device);
|
||||
~PortTransmitter();
|
||||
|
||||
bool setRateAccuracy(AbstractPort::Accuracy accuracy);
|
||||
|
||||
void clearPacketList();
|
||||
void loopNextPacketSet(qint64 size, qint64 repeats,
|
||||
long repeatDelaySec, long repeatDelayNsec);
|
||||
bool appendToPacketList(long sec, long usec, const uchar *packet,
|
||||
int length);
|
||||
void setPacketListLoopMode(bool loop, quint64 secDelay, quint64 nsecDelay) {
|
||||
returnToQIdx_ = loop ? 0 : -1;
|
||||
loopDelay_ = secDelay*long(1e6) + nsecDelay/1000;
|
||||
}
|
||||
void setHandle(pcap_t *handle);
|
||||
void useExternalStats(AbstractPort::PortStats *stats);
|
||||
void run();
|
||||
void start();
|
||||
void stop();
|
||||
bool isRunning();
|
||||
private:
|
||||
enum State
|
||||
{
|
||||
kNotStarted,
|
||||
kRunning,
|
||||
kFinished
|
||||
};
|
||||
|
||||
class PacketSequence
|
||||
{
|
||||
public:
|
||||
PacketSequence() {
|
||||
sendQueue_ = pcap_sendqueue_alloc(1*1024*1024);
|
||||
lastPacket_ = NULL;
|
||||
packets_ = 0;
|
||||
bytes_ = 0;
|
||||
usecDuration_ = 0;
|
||||
repeatCount_ = 1;
|
||||
repeatSize_ = 1;
|
||||
usecDelay_ = 0;
|
||||
}
|
||||
~PacketSequence() {
|
||||
pcap_sendqueue_destroy(sendQueue_);
|
||||
}
|
||||
bool hasFreeSpace(int size) {
|
||||
if ((sendQueue_->len + size) <= sendQueue_->maxlen)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
int appendPacket(const struct pcap_pkthdr *pktHeader,
|
||||
const uchar *pktData) {
|
||||
if (lastPacket_)
|
||||
{
|
||||
usecDuration_ += (pktHeader->ts.tv_sec
|
||||
- lastPacket_->ts.tv_sec) * long(1e6);
|
||||
usecDuration_ += (pktHeader->ts.tv_usec
|
||||
- lastPacket_->ts.tv_usec);
|
||||
}
|
||||
packets_++;
|
||||
bytes_ += pktHeader->caplen;
|
||||
lastPacket_ = (struct pcap_pkthdr *)
|
||||
(sendQueue_->buffer + sendQueue_->len);
|
||||
return pcap_sendqueue_queue(sendQueue_, pktHeader, pktData);
|
||||
}
|
||||
pcap_send_queue *sendQueue_;
|
||||
struct pcap_pkthdr *lastPacket_;
|
||||
long packets_;
|
||||
long bytes_;
|
||||
ulong usecDuration_;
|
||||
int repeatCount_;
|
||||
int repeatSize_;
|
||||
long usecDelay_;
|
||||
};
|
||||
|
||||
static void udelay(unsigned long usec);
|
||||
int sendQueueTransmit(pcap_t *p, pcap_send_queue *queue, long &overHead,
|
||||
int sync);
|
||||
|
||||
QList<PacketSequence*> packetSequenceList_;
|
||||
PacketSequence *currentPacketSequence_;
|
||||
int repeatSequenceStart_;
|
||||
quint64 repeatSize_;
|
||||
quint64 packetCount_;
|
||||
|
||||
int returnToQIdx_;
|
||||
quint64 loopDelay_;
|
||||
|
||||
void (*udelayFn_)(unsigned long);
|
||||
|
||||
bool usingInternalStats_;
|
||||
AbstractPort::PortStats *stats_;
|
||||
bool usingInternalHandle_;
|
||||
pcap_t *handle_;
|
||||
volatile bool stop_;
|
||||
volatile State state_;
|
||||
};
|
||||
|
||||
class PortCapturer: public QThread
|
||||
{
|
||||
public:
|
||||
@ -263,9 +165,13 @@ protected:
|
||||
void updateNotes();
|
||||
|
||||
private:
|
||||
PortTransmitter *transmitter_;
|
||||
bool startStreamStatsTracking();
|
||||
bool stopStreamStatsTracking();
|
||||
|
||||
PcapTransmitter *transmitter_;
|
||||
PortCapturer *capturer_;
|
||||
EmulationTransceiver *emulXcvr_;
|
||||
PcapRxStats *rxStatsPoller_;
|
||||
|
||||
static pcap_if_t *deviceList_;
|
||||
};
|
||||
|
186
server/pcaprxstats.cpp
Normal file
186
server/pcaprxstats.cpp
Normal file
@ -0,0 +1,186 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#include "pcaprxstats.h"
|
||||
|
||||
#include "pcapextra.h"
|
||||
#include "../common/sign.h"
|
||||
|
||||
#define notify qWarning // FIXME
|
||||
|
||||
PcapRxStats::PcapRxStats(const char *device, StreamStats &portStreamStats)
|
||||
: streamStats_(portStreamStats)
|
||||
{
|
||||
device_ = QString::fromAscii(device);
|
||||
stop_ = false;
|
||||
state_ = kNotStarted;
|
||||
isDirectional_ = true;
|
||||
|
||||
handle_ = NULL;
|
||||
}
|
||||
|
||||
pcap_t* PcapRxStats::handle()
|
||||
{
|
||||
return handle_;
|
||||
}
|
||||
|
||||
void PcapRxStats::run()
|
||||
{
|
||||
int flags = PCAP_OPENFLAG_PROMISCUOUS;
|
||||
char errbuf[PCAP_ERRBUF_SIZE] = "";
|
||||
struct bpf_program bpf;
|
||||
const int optimize = 1;
|
||||
QString capture_filter = QString("(ether[len - 4:4] == 0x%1)").arg(
|
||||
SignProtocol::magic(), 0, BASE_HEX);
|
||||
// XXX: Exclude ICMP packets which contain an embedded signed packet
|
||||
// For now we check upto 4 vlan tags
|
||||
capture_filter.append(
|
||||
"and not ("
|
||||
"icmp or "
|
||||
"(vlan and icmp) or "
|
||||
"(vlan and icmp) or "
|
||||
"(vlan and icmp) or "
|
||||
"(vlan and icmp) "
|
||||
")");
|
||||
|
||||
qDebug("In %s", __PRETTY_FUNCTION__);
|
||||
|
||||
handle_ = pcap_open_live(qPrintable(device_), 65535,
|
||||
flags, 100 /* ms */, errbuf);
|
||||
if (handle_ == NULL) {
|
||||
if (flags && QString(errbuf).contains("promiscuous")) {
|
||||
notify("Unable to set promiscuous mode on <%s> - "
|
||||
"stream stats rx will not work", qPrintable(device_));
|
||||
goto _exit;
|
||||
}
|
||||
else {
|
||||
notify("Unable to open <%s> [%s] - stream stats rx will not work",
|
||||
qPrintable(device_), errbuf);
|
||||
goto _exit;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
// pcap_setdirection() API is not supported in Windows.
|
||||
// NOTE: WinPcap 4.1.1 and above exports a dummy API that returns -1
|
||||
// but since we would like to work with previous versions of WinPcap
|
||||
// also, we assume the API does not exist
|
||||
isDirectional_ = false;
|
||||
#else
|
||||
if (pcap_setdirection(handle_, PCAP_D_IN) < 0) {
|
||||
qDebug("RxStats: Error setting IN direction %s: %s\n",
|
||||
qPrintable(device_), pcap_geterr(handle_));
|
||||
isDirectional_ = false;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (pcap_compile(handle_, &bpf, qPrintable(capture_filter),
|
||||
optimize, 0) < 0) {
|
||||
qWarning("%s: error compiling filter: %s", qPrintable(device_),
|
||||
pcap_geterr(handle_));
|
||||
goto _skip_filter;
|
||||
}
|
||||
|
||||
if (pcap_setfilter(handle_, &bpf) < 0) {
|
||||
qWarning("%s: error setting filter: %s", qPrintable(device_),
|
||||
pcap_geterr(handle_));
|
||||
goto _skip_filter;
|
||||
}
|
||||
|
||||
_skip_filter:
|
||||
state_ = kRunning;
|
||||
while (1) {
|
||||
int ret;
|
||||
struct pcap_pkthdr *hdr;
|
||||
const uchar *data;
|
||||
|
||||
ret = pcap_next_ex(handle_, &hdr, &data);
|
||||
switch (ret) {
|
||||
case 1: {
|
||||
uint guid;
|
||||
if (SignProtocol::packetGuid(data, hdr->caplen, &guid)) {
|
||||
streamStats_[guid].rx_pkts++;
|
||||
streamStats_[guid].rx_bytes += hdr->caplen;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 0:
|
||||
// timeout: just go back to the loop
|
||||
break;
|
||||
case -1:
|
||||
qWarning("%s: error reading packet (%d): %s",
|
||||
__PRETTY_FUNCTION__, ret, pcap_geterr(handle_));
|
||||
break;
|
||||
case -2:
|
||||
default:
|
||||
qFatal("%s: Unexpected return value %d", __PRETTY_FUNCTION__,
|
||||
ret);
|
||||
}
|
||||
|
||||
if (stop_) {
|
||||
qDebug("user requested receiver stop\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
pcap_close(handle_);
|
||||
handle_ = NULL;
|
||||
stop_ = false;
|
||||
|
||||
_exit:
|
||||
state_ = kFinished;
|
||||
}
|
||||
|
||||
bool PcapRxStats::start()
|
||||
{
|
||||
if (state_ == kRunning) {
|
||||
qWarning("RxStats start requested but is already running!");
|
||||
goto _exit;
|
||||
}
|
||||
|
||||
state_ = kNotStarted;
|
||||
QThread::start();
|
||||
|
||||
while (state_ == kNotStarted)
|
||||
QThread::msleep(10);
|
||||
_exit:
|
||||
return true;
|
||||
}
|
||||
|
||||
bool PcapRxStats::stop()
|
||||
{
|
||||
if (state_ == kRunning) {
|
||||
stop_ = true;
|
||||
while (state_ == kRunning)
|
||||
QThread::msleep(10);
|
||||
}
|
||||
else
|
||||
qWarning("RxStats stop requested but is not running!");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool PcapRxStats::isRunning()
|
||||
{
|
||||
return (state_ == kRunning);
|
||||
}
|
||||
|
||||
bool PcapRxStats::isDirectional()
|
||||
{
|
||||
return isDirectional_;
|
||||
}
|
54
server/pcaprxstats.h
Normal file
54
server/pcaprxstats.h
Normal file
@ -0,0 +1,54 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _PCAP_RX_STATS_H
|
||||
#define _PCAP_RX_STATS_H
|
||||
|
||||
#include "streamstats.h"
|
||||
|
||||
#include <QThread>
|
||||
#include <pcap.h>
|
||||
|
||||
class PcapRxStats: public QThread
|
||||
{
|
||||
public:
|
||||
PcapRxStats(const char *device, StreamStats &portStreamStats);
|
||||
pcap_t* handle();
|
||||
void run();
|
||||
bool start();
|
||||
bool stop();
|
||||
bool isRunning();
|
||||
bool isDirectional();
|
||||
|
||||
private:
|
||||
enum State {
|
||||
kNotStarted,
|
||||
kRunning,
|
||||
kFinished
|
||||
};
|
||||
|
||||
QString device_;
|
||||
StreamStats &streamStats_;
|
||||
volatile bool stop_;
|
||||
pcap_t *handle_;
|
||||
volatile State state_;
|
||||
bool isDirectional_;
|
||||
};
|
||||
|
||||
#endif
|
130
server/pcaptransmitter.cpp
Normal file
130
server/pcaptransmitter.cpp
Normal file
@ -0,0 +1,130 @@
|
||||
/*
|
||||
Copyright (C) 2010-2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#include "pcaptransmitter.h"
|
||||
|
||||
PcapTransmitter::PcapTransmitter(
|
||||
const char *device,
|
||||
StreamStats &portStreamStats)
|
||||
: streamStats_(portStreamStats), txThread_(device)
|
||||
{
|
||||
adjustRxStreamStats_ = false;
|
||||
memset(&stats_, 0, sizeof(stats_));
|
||||
txStats_.setTxThreadStats(&stats_);
|
||||
txStats_.start(); // TODO: alongwith user transmit start
|
||||
|
||||
txThread_.setStats(&stats_);
|
||||
connect(&txThread_, SIGNAL(finished()), SLOT(updateTxThreadStreamStats()));
|
||||
}
|
||||
|
||||
PcapTransmitter::~PcapTransmitter()
|
||||
{
|
||||
txStats_.stop(); // TODO: alongwith user transmit stop
|
||||
}
|
||||
|
||||
bool PcapTransmitter::setRateAccuracy(
|
||||
AbstractPort::Accuracy accuracy)
|
||||
{
|
||||
return txThread_.setRateAccuracy(accuracy);
|
||||
}
|
||||
|
||||
void PcapTransmitter::adjustRxStreamStats(bool enable)
|
||||
{
|
||||
adjustRxStreamStats_ = enable;
|
||||
}
|
||||
|
||||
bool PcapTransmitter::setStreamStatsTracking(bool enable)
|
||||
{
|
||||
return txThread_.setStreamStatsTracking(enable);
|
||||
}
|
||||
|
||||
void PcapTransmitter::clearPacketList()
|
||||
{
|
||||
txThread_.clearPacketList();
|
||||
}
|
||||
|
||||
void PcapTransmitter::loopNextPacketSet(
|
||||
qint64 size,
|
||||
qint64 repeats,
|
||||
long repeatDelaySec,
|
||||
long repeatDelayNsec)
|
||||
{
|
||||
txThread_.loopNextPacketSet(size, repeats, repeatDelaySec, repeatDelayNsec);
|
||||
}
|
||||
|
||||
bool PcapTransmitter::appendToPacketList(long sec, long nsec,
|
||||
const uchar *packet, int length)
|
||||
{
|
||||
return txThread_.appendToPacketList(sec, nsec, packet, length);
|
||||
}
|
||||
|
||||
void PcapTransmitter::setHandle(pcap_t *handle)
|
||||
{
|
||||
txThread_.setHandle(handle);
|
||||
}
|
||||
|
||||
void PcapTransmitter::setPacketListLoopMode(
|
||||
bool loop,
|
||||
quint64 secDelay,
|
||||
quint64 nsecDelay)
|
||||
{
|
||||
txThread_.setPacketListLoopMode(loop, secDelay, nsecDelay);
|
||||
}
|
||||
|
||||
void PcapTransmitter::useExternalStats(AbstractPort::PortStats *stats)
|
||||
{
|
||||
txStats_.useExternalStats(stats);
|
||||
}
|
||||
|
||||
void PcapTransmitter::start()
|
||||
{
|
||||
txThread_.start();
|
||||
}
|
||||
|
||||
void PcapTransmitter::stop()
|
||||
{
|
||||
txThread_.stop();
|
||||
}
|
||||
|
||||
bool PcapTransmitter::isRunning()
|
||||
{
|
||||
return txThread_.isRunning();
|
||||
}
|
||||
|
||||
void PcapTransmitter::updateTxThreadStreamStats()
|
||||
{
|
||||
PcapTxThread *txThread = dynamic_cast<PcapTxThread*>(sender());
|
||||
const StreamStats& threadStreamStats = txThread->streamStats();
|
||||
StreamStatsIterator i(threadStreamStats);
|
||||
|
||||
while (i.hasNext())
|
||||
{
|
||||
i.next();
|
||||
uint guid = i.key();
|
||||
StreamStatsTuple sst = i.value();
|
||||
|
||||
streamStats_[guid].tx_pkts += sst.tx_pkts;
|
||||
streamStats_[guid].tx_bytes += sst.tx_bytes;
|
||||
if (adjustRxStreamStats_) {
|
||||
streamStats_[guid].rx_pkts -= sst.tx_pkts;
|
||||
streamStats_[guid].rx_bytes -= sst.tx_bytes;
|
||||
}
|
||||
}
|
||||
txThread->clearStreamStats();
|
||||
}
|
63
server/pcaptransmitter.h
Normal file
63
server/pcaptransmitter.h
Normal file
@ -0,0 +1,63 @@
|
||||
/*
|
||||
Copyright (C) 2010-2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _PCAP_TRANSMITTER_H
|
||||
#define _PCAP_TRANSMITTER_H
|
||||
|
||||
#include "abstractport.h"
|
||||
#include "pcaptxstats.h"
|
||||
#include "pcaptxthread.h"
|
||||
#include "statstuple.h"
|
||||
|
||||
class PcapTransmitter : QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
PcapTransmitter(const char *device, StreamStats &portStreamStats);
|
||||
~PcapTransmitter();
|
||||
|
||||
bool setRateAccuracy(AbstractPort::Accuracy accuracy);
|
||||
bool setStreamStatsTracking(bool enable);
|
||||
void adjustRxStreamStats(bool enable);
|
||||
|
||||
void clearPacketList();
|
||||
void loopNextPacketSet(qint64 size, qint64 repeats,
|
||||
long repeatDelaySec, long repeatDelayNsec);
|
||||
bool appendToPacketList(long sec, long usec, const uchar *packet,
|
||||
int length);
|
||||
void setPacketListLoopMode(bool loop, quint64 secDelay, quint64 nsecDelay);
|
||||
|
||||
void setHandle(pcap_t *handle);
|
||||
void useExternalStats(AbstractPort::PortStats *stats);
|
||||
|
||||
void start();
|
||||
void stop();
|
||||
bool isRunning();
|
||||
private slots:
|
||||
void updateTxThreadStreamStats();
|
||||
private:
|
||||
StreamStats &streamStats_;
|
||||
PcapTxThread txThread_;
|
||||
PcapTxStats txStats_;
|
||||
StatsTuple stats_;
|
||||
bool adjustRxStreamStats_;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
86
server/pcaptxstats.cpp
Normal file
86
server/pcaptxstats.cpp
Normal file
@ -0,0 +1,86 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#include "pcaptxstats.h"
|
||||
|
||||
#include "pcaptxstats.h"
|
||||
#include "statstuple.h"
|
||||
|
||||
PcapTxStats::PcapTxStats()
|
||||
{
|
||||
txThreadStats_ = NULL;
|
||||
|
||||
stats_ = new AbstractPort::PortStats;
|
||||
usingInternalStats_ = true;
|
||||
|
||||
stop_ = false;
|
||||
}
|
||||
|
||||
PcapTxStats::~PcapTxStats()
|
||||
{
|
||||
if (usingInternalStats_)
|
||||
delete stats_;
|
||||
}
|
||||
|
||||
void PcapTxStats::setTxThreadStats(StatsTuple *stats)
|
||||
{
|
||||
txThreadStats_ = stats;
|
||||
}
|
||||
|
||||
void PcapTxStats::useExternalStats(AbstractPort::PortStats *stats)
|
||||
{
|
||||
if (usingInternalStats_)
|
||||
delete stats_;
|
||||
stats_ = stats;
|
||||
usingInternalStats_ = false;
|
||||
}
|
||||
|
||||
void PcapTxStats::start()
|
||||
{
|
||||
QThread::start();
|
||||
|
||||
while (!isRunning())
|
||||
QThread::msleep(10);
|
||||
}
|
||||
|
||||
void PcapTxStats::stop()
|
||||
{
|
||||
stop_ = true;
|
||||
|
||||
while (isRunning())
|
||||
QThread::msleep(10);
|
||||
}
|
||||
|
||||
void PcapTxStats::run()
|
||||
{
|
||||
Q_ASSERT(txThreadStats_);
|
||||
|
||||
qDebug("txStats: collection start");
|
||||
|
||||
while (1) {
|
||||
stats_->txPkts = txThreadStats_->pkts;
|
||||
stats_->txBytes = txThreadStats_->bytes;
|
||||
|
||||
if (stop_)
|
||||
break;
|
||||
QThread::msleep(1000);
|
||||
}
|
||||
stop_ = false;
|
||||
qDebug("txStats: collection end");
|
||||
}
|
53
server/pcaptxstats.h
Normal file
53
server/pcaptxstats.h
Normal file
@ -0,0 +1,53 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _PCAP_TX_STATS_H
|
||||
#define _PCAP_TX_STATS_H
|
||||
|
||||
#include "abstractport.h"
|
||||
|
||||
#include <QThread>
|
||||
|
||||
class StatsTuple;
|
||||
|
||||
class PcapTxStats : public QThread
|
||||
{
|
||||
public:
|
||||
PcapTxStats();
|
||||
~PcapTxStats();
|
||||
|
||||
void setTxThreadStats(StatsTuple *stats);
|
||||
|
||||
void useExternalStats(AbstractPort::PortStats *stats);
|
||||
|
||||
void start();
|
||||
void stop();
|
||||
private:
|
||||
void run();
|
||||
|
||||
StatsTuple *txThreadStats_;
|
||||
|
||||
bool usingInternalStats_;
|
||||
AbstractPort::PortStats *stats_;
|
||||
|
||||
volatile bool stop_;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
596
server/pcaptxthread.cpp
Normal file
596
server/pcaptxthread.cpp
Normal file
@ -0,0 +1,596 @@
|
||||
/*
|
||||
Copyright (C) 2010-2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#include "pcaptransmitter.h"
|
||||
|
||||
#include "statstuple.h"
|
||||
#include "timestamp.h"
|
||||
|
||||
#define __STDC_FORMAT_MACROS
|
||||
#include <inttypes.h>
|
||||
|
||||
PcapTxThread::PcapTxThread(const char *device)
|
||||
{
|
||||
char errbuf[PCAP_ERRBUF_SIZE] = "";
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
LARGE_INTEGER freq;
|
||||
if (QueryPerformanceFrequency(&freq))
|
||||
gTicksFreq = freq.QuadPart;
|
||||
else
|
||||
Q_ASSERT_X(false, "PcapTxThread::PcapTxThread",
|
||||
"This Win32 platform does not support performance counter");
|
||||
#endif
|
||||
state_ = kNotStarted;
|
||||
stop_ = false;
|
||||
trackStreamStats_ = false;
|
||||
clearPacketList();
|
||||
handle_ = pcap_open_live(device, 64 /* FIXME */, 0, 1000 /* ms */, errbuf);
|
||||
|
||||
if (handle_ == NULL)
|
||||
goto _open_error;
|
||||
|
||||
usingInternalHandle_ = true;
|
||||
|
||||
stats_ = NULL;
|
||||
|
||||
return;
|
||||
|
||||
_open_error:
|
||||
qDebug("%s: Error opening port %s: %s\n", __FUNCTION__, device, errbuf);
|
||||
usingInternalHandle_ = false;
|
||||
}
|
||||
|
||||
PcapTxThread::~PcapTxThread()
|
||||
{
|
||||
if (usingInternalHandle_)
|
||||
pcap_close(handle_);
|
||||
}
|
||||
|
||||
bool PcapTxThread::setRateAccuracy(
|
||||
AbstractPort::Accuracy accuracy)
|
||||
{
|
||||
switch (accuracy) {
|
||||
case AbstractPort::kHighAccuracy:
|
||||
udelayFn_ = udelay;
|
||||
qWarning("%s: rate accuracy set to High - busy wait", __FUNCTION__);
|
||||
break;
|
||||
case AbstractPort::kLowAccuracy:
|
||||
udelayFn_ = QThread::usleep;
|
||||
qWarning("%s: rate accuracy set to Low - usleep", __FUNCTION__);
|
||||
break;
|
||||
default:
|
||||
qWarning("%s: unsupported rate accuracy value %d", __FUNCTION__,
|
||||
accuracy);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool PcapTxThread::setStreamStatsTracking(bool enable)
|
||||
{
|
||||
trackStreamStats_ = enable;
|
||||
return true;
|
||||
}
|
||||
|
||||
void PcapTxThread::clearPacketList()
|
||||
{
|
||||
Q_ASSERT(!isRunning());
|
||||
// \todo lock for packetSequenceList
|
||||
while(packetSequenceList_.size())
|
||||
delete packetSequenceList_.takeFirst();
|
||||
|
||||
currentPacketSequence_ = NULL;
|
||||
repeatSequenceStart_ = -1;
|
||||
repeatSize_ = 0;
|
||||
packetCount_ = 0;
|
||||
|
||||
packetListSize_ = 0;
|
||||
returnToQIdx_ = -1;
|
||||
|
||||
setPacketListLoopMode(false, 0, 0);
|
||||
}
|
||||
|
||||
void PcapTxThread::loopNextPacketSet(qint64 size, qint64 repeats,
|
||||
long repeatDelaySec, long repeatDelayNsec)
|
||||
{
|
||||
currentPacketSequence_ = new PacketSequence(trackStreamStats_);
|
||||
currentPacketSequence_->repeatCount_ = repeats;
|
||||
currentPacketSequence_->usecDelay_ = repeatDelaySec * long(1e6)
|
||||
+ repeatDelayNsec/1000;
|
||||
|
||||
repeatSequenceStart_ = packetSequenceList_.size();
|
||||
repeatSize_ = size;
|
||||
packetCount_ = 0;
|
||||
|
||||
packetSequenceList_.append(currentPacketSequence_);
|
||||
}
|
||||
|
||||
bool PcapTxThread::appendToPacketList(long sec, long nsec,
|
||||
const uchar *packet, int length)
|
||||
{
|
||||
bool op = true;
|
||||
pcap_pkthdr pktHdr;
|
||||
|
||||
pktHdr.caplen = pktHdr.len = length;
|
||||
pktHdr.ts.tv_sec = sec;
|
||||
pktHdr.ts.tv_usec = nsec/1000;
|
||||
|
||||
if (currentPacketSequence_ == NULL ||
|
||||
!currentPacketSequence_->hasFreeSpace(2*sizeof(pcap_pkthdr)+length))
|
||||
{
|
||||
if (currentPacketSequence_ != NULL)
|
||||
{
|
||||
long usecs;
|
||||
|
||||
usecs = (pktHdr.ts.tv_sec
|
||||
- currentPacketSequence_->lastPacket_->ts.tv_sec)
|
||||
* long(1e6);
|
||||
usecs += (pktHdr.ts.tv_usec
|
||||
- currentPacketSequence_->lastPacket_->ts.tv_usec);
|
||||
currentPacketSequence_->usecDelay_ = usecs;
|
||||
}
|
||||
|
||||
//! \todo (LOW): calculate sendqueue size
|
||||
currentPacketSequence_ = new PacketSequence(trackStreamStats_);
|
||||
|
||||
packetSequenceList_.append(currentPacketSequence_);
|
||||
|
||||
// Validate that the pkt will fit inside the new currentSendQueue_
|
||||
Q_ASSERT(currentPacketSequence_->hasFreeSpace(
|
||||
sizeof(pcap_pkthdr) + length));
|
||||
}
|
||||
|
||||
if (currentPacketSequence_->appendPacket(&pktHdr, (u_char*) packet) < 0)
|
||||
{
|
||||
op = false;
|
||||
}
|
||||
|
||||
packetCount_++;
|
||||
packetListSize_ += repeatSize_ ?
|
||||
currentPacketSequence_->repeatCount_ : 1;
|
||||
if (repeatSize_ > 0 && packetCount_ == repeatSize_)
|
||||
{
|
||||
qDebug("repeatSequenceStart_=%d, repeatSize_ = %llu",
|
||||
repeatSequenceStart_, repeatSize_);
|
||||
|
||||
// Set the packetSequence repeatSize
|
||||
Q_ASSERT(repeatSequenceStart_ >= 0);
|
||||
Q_ASSERT(repeatSequenceStart_ < packetSequenceList_.size());
|
||||
|
||||
if (currentPacketSequence_ != packetSequenceList_[repeatSequenceStart_])
|
||||
{
|
||||
PacketSequence *start = packetSequenceList_[repeatSequenceStart_];
|
||||
|
||||
currentPacketSequence_->usecDelay_ = start->usecDelay_;
|
||||
start->usecDelay_ = 0;
|
||||
start->repeatSize_ =
|
||||
packetSequenceList_.size() - repeatSequenceStart_;
|
||||
}
|
||||
|
||||
repeatSize_ = 0;
|
||||
|
||||
// End current pktSeq and trigger a new pktSeq allocation for next pkt
|
||||
currentPacketSequence_ = NULL;
|
||||
}
|
||||
|
||||
return op;
|
||||
}
|
||||
|
||||
void PcapTxThread::setPacketListLoopMode(
|
||||
bool loop,
|
||||
quint64 secDelay,
|
||||
quint64 nsecDelay)
|
||||
{
|
||||
returnToQIdx_ = loop ? 0 : -1;
|
||||
loopDelay_ = secDelay*long(1e6) + nsecDelay/1000;
|
||||
}
|
||||
|
||||
void PcapTxThread::setHandle(pcap_t *handle)
|
||||
{
|
||||
if (usingInternalHandle_)
|
||||
pcap_close(handle_);
|
||||
handle_ = handle;
|
||||
usingInternalHandle_ = false;
|
||||
}
|
||||
|
||||
void PcapTxThread::setStats(StatsTuple *stats)
|
||||
{
|
||||
stats_ = stats;
|
||||
}
|
||||
|
||||
const StreamStats& PcapTxThread::streamStats()
|
||||
{
|
||||
return streamStats_;
|
||||
}
|
||||
|
||||
void PcapTxThread::clearStreamStats()
|
||||
{
|
||||
streamStats_.clear();
|
||||
}
|
||||
|
||||
void PcapTxThread::run()
|
||||
{
|
||||
//! \todo (MED) Stream Mode - continuous: define before implement
|
||||
|
||||
// NOTE1: We can't use pcap_sendqueue_transmit() directly even on Win32
|
||||
// 'coz of 2 reasons - there's no way of stopping it before all packets
|
||||
// in the sendQueue are sent out and secondly, stats are available only
|
||||
// when all packets have been sent - no periodic updates
|
||||
//
|
||||
// NOTE2: Transmit on the Rx Handle so that we can receive it back
|
||||
// on the Tx Handle to do stats
|
||||
//
|
||||
// NOTE3: Update pcapExtra counters - port TxStats will be updated in the
|
||||
// 'stats callback' function so that both Rx and Tx stats are updated
|
||||
// together
|
||||
|
||||
const int kSyncTransmit = 1;
|
||||
int i;
|
||||
long overHead = 0; // overHead should be negative or zero
|
||||
|
||||
qDebug("packetSequenceList_.size = %d", packetSequenceList_.size());
|
||||
if (packetSequenceList_.size() <= 0)
|
||||
goto _exit;
|
||||
|
||||
for(i = 0; i < packetSequenceList_.size(); i++) {
|
||||
qDebug("sendQ[%d]: rptCnt = %d, rptSz = %d, usecDelay = %ld", i,
|
||||
packetSequenceList_.at(i)->repeatCount_,
|
||||
packetSequenceList_.at(i)->repeatSize_,
|
||||
packetSequenceList_.at(i)->usecDelay_);
|
||||
qDebug("sendQ[%d]: pkts = %ld, usecDuration = %ld", i,
|
||||
packetSequenceList_.at(i)->packets_,
|
||||
packetSequenceList_.at(i)->usecDuration_);
|
||||
}
|
||||
|
||||
lastStats_ = *stats_; // used for stream stats
|
||||
|
||||
state_ = kRunning;
|
||||
i = 0;
|
||||
while (i < packetSequenceList_.size())
|
||||
{
|
||||
|
||||
_restart:
|
||||
int rptSz = packetSequenceList_.at(i)->repeatSize_;
|
||||
int rptCnt = packetSequenceList_.at(i)->repeatCount_;
|
||||
|
||||
for (int j = 0; j < rptCnt; j++)
|
||||
{
|
||||
for (int k = 0; k < rptSz; k++)
|
||||
{
|
||||
int ret;
|
||||
PacketSequence *seq = packetSequenceList_.at(i+k);
|
||||
#ifdef Q_OS_WIN32
|
||||
TimeStamp ovrStart, ovrEnd;
|
||||
|
||||
if (seq->usecDuration_ <= long(1e6)) // 1s
|
||||
{
|
||||
getTimeStamp(&ovrStart);
|
||||
ret = pcap_sendqueue_transmit(handle_,
|
||||
seq->sendQueue_, kSyncTransmit);
|
||||
if (ret >= 0)
|
||||
{
|
||||
stats_->pkts += seq->packets_;
|
||||
stats_->bytes += seq->bytes_;
|
||||
|
||||
getTimeStamp(&ovrEnd);
|
||||
overHead += seq->usecDuration_
|
||||
- udiffTimeStamp(&ovrStart, &ovrEnd);
|
||||
Q_ASSERT(overHead <= 0);
|
||||
}
|
||||
if (stop_)
|
||||
ret = -2;
|
||||
}
|
||||
else
|
||||
{
|
||||
ret = sendQueueTransmit(handle_, seq->sendQueue_,
|
||||
overHead, kSyncTransmit);
|
||||
}
|
||||
#else
|
||||
ret = sendQueueTransmit(handle_, seq->sendQueue_,
|
||||
overHead, kSyncTransmit);
|
||||
#endif
|
||||
|
||||
if (ret >= 0)
|
||||
{
|
||||
long usecs = seq->usecDelay_ + overHead;
|
||||
if (usecs > 0)
|
||||
{
|
||||
(*udelayFn_)(usecs);
|
||||
overHead = 0;
|
||||
}
|
||||
else
|
||||
overHead = usecs;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug("error %d in sendQueueTransmit()", ret);
|
||||
qDebug("overHead = %ld", overHead);
|
||||
stop_ = false;
|
||||
goto _exit;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Move to the next Packet Set
|
||||
i += rptSz;
|
||||
}
|
||||
|
||||
if (returnToQIdx_ >= 0)
|
||||
{
|
||||
long usecs = loopDelay_ + overHead;
|
||||
|
||||
if (usecs > 0)
|
||||
{
|
||||
(*udelayFn_)(usecs);
|
||||
overHead = 0;
|
||||
}
|
||||
else
|
||||
overHead = usecs;
|
||||
|
||||
i = returnToQIdx_;
|
||||
goto _restart;
|
||||
}
|
||||
|
||||
_exit:
|
||||
if (trackStreamStats_)
|
||||
updateStreamStats();
|
||||
|
||||
state_ = kFinished;
|
||||
}
|
||||
|
||||
void PcapTxThread::start()
|
||||
{
|
||||
// FIXME: return error
|
||||
if (state_ == kRunning) {
|
||||
qWarning("Transmit start requested but is already running!");
|
||||
return;
|
||||
}
|
||||
|
||||
state_ = kNotStarted;
|
||||
QThread::start();
|
||||
|
||||
while (state_ == kNotStarted)
|
||||
QThread::msleep(10);
|
||||
}
|
||||
|
||||
void PcapTxThread::stop()
|
||||
{
|
||||
if (state_ == kRunning) {
|
||||
stop_ = true;
|
||||
while (state_ == kRunning)
|
||||
QThread::msleep(10);
|
||||
}
|
||||
else {
|
||||
// FIXME: return error
|
||||
qWarning("Transmit stop requested but is not running!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
bool PcapTxThread::isRunning()
|
||||
{
|
||||
return (state_ == kRunning);
|
||||
}
|
||||
|
||||
int PcapTxThread::sendQueueTransmit(pcap_t *p,
|
||||
pcap_send_queue *queue, long &overHead, int sync)
|
||||
{
|
||||
TimeStamp ovrStart, ovrEnd;
|
||||
struct timeval ts;
|
||||
struct pcap_pkthdr *hdr = (struct pcap_pkthdr*) queue->buffer;
|
||||
char *end = queue->buffer + queue->len;
|
||||
|
||||
ts = hdr->ts;
|
||||
|
||||
getTimeStamp(&ovrStart);
|
||||
while((char*) hdr < end)
|
||||
{
|
||||
uchar *pkt = (uchar*)hdr + sizeof(*hdr);
|
||||
int pktLen = hdr->caplen;
|
||||
|
||||
if (sync)
|
||||
{
|
||||
long usec = (hdr->ts.tv_sec - ts.tv_sec) * 1000000 +
|
||||
(hdr->ts.tv_usec - ts.tv_usec);
|
||||
|
||||
getTimeStamp(&ovrEnd);
|
||||
|
||||
overHead -= udiffTimeStamp(&ovrStart, &ovrEnd);
|
||||
Q_ASSERT(overHead <= 0);
|
||||
usec += overHead;
|
||||
if (usec > 0)
|
||||
{
|
||||
(*udelayFn_)(usec);
|
||||
overHead = 0;
|
||||
}
|
||||
else
|
||||
overHead = usec;
|
||||
|
||||
ts = hdr->ts;
|
||||
getTimeStamp(&ovrStart);
|
||||
}
|
||||
|
||||
Q_ASSERT(pktLen > 0);
|
||||
|
||||
pcap_sendpacket(p, pkt, pktLen);
|
||||
stats_->pkts++;
|
||||
stats_->bytes += pktLen;
|
||||
|
||||
// Step to the next packet in the buffer
|
||||
hdr = (struct pcap_pkthdr*) (pkt + pktLen);
|
||||
pkt = (uchar*) ((uchar*)hdr + sizeof(*hdr)); // FIXME: superfluous?
|
||||
|
||||
if (stop_)
|
||||
{
|
||||
return -2;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void PcapTxThread::updateStreamStats()
|
||||
{
|
||||
// If no packets in list, nothing to be done
|
||||
if (!packetListSize_)
|
||||
return;
|
||||
|
||||
// Get number of tx packets sent during last transmit
|
||||
quint64 pkts = stats_->pkts > lastStats_.pkts ?
|
||||
stats_->pkts - lastStats_.pkts :
|
||||
stats_->pkts + (ULLONG_MAX - lastStats_.pkts);
|
||||
|
||||
// Calculate -
|
||||
// number of complete repeats of packetList_
|
||||
// => each PacketSet in the packetList is repeated these many times
|
||||
// number of pkts sent in last partial repeat of packetList_
|
||||
// - This encompasses 0 or more potentially partial PacketSets
|
||||
// XXX: Note for the above, we consider a PacketSet to include its
|
||||
// own repeats within itself
|
||||
int c = pkts/packetListSize_;
|
||||
int d = pkts%packetListSize_;
|
||||
|
||||
qDebug("%s:", __FUNCTION__);
|
||||
qDebug("txPkts = %" PRIu64, pkts);
|
||||
qDebug("packetListSize_ = %" PRIu64, packetListSize_);
|
||||
qDebug("c = %d, d = %d\n", c, d);
|
||||
|
||||
int i;
|
||||
|
||||
if (!c)
|
||||
goto _last_repeat;
|
||||
|
||||
i = 0;
|
||||
while (i < packetSequenceList_.size()) {
|
||||
PacketSequence *seq = packetSequenceList_.at(i);
|
||||
int rptSz = seq->repeatSize_;
|
||||
int rptCnt = seq->repeatCount_;
|
||||
|
||||
for (int k = 0; k < rptSz; k++) {
|
||||
seq = packetSequenceList_.at(i+k);
|
||||
StreamStatsIterator iter(seq->streamStatsMeta_);
|
||||
while (iter.hasNext()) {
|
||||
iter.next();
|
||||
uint guid = iter.key();
|
||||
StreamStatsTuple ssm = iter.value();
|
||||
streamStats_[guid].tx_pkts += c * rptCnt * ssm.tx_pkts;
|
||||
streamStats_[guid].tx_bytes += c * rptCnt * ssm.tx_bytes;
|
||||
}
|
||||
}
|
||||
// Move to the next Packet Set
|
||||
i += rptSz;
|
||||
}
|
||||
|
||||
_last_repeat:
|
||||
if (!d)
|
||||
goto _done;
|
||||
|
||||
i = 0;
|
||||
while (i < packetSequenceList_.size()) {
|
||||
PacketSequence *seq = packetSequenceList_.at(i);
|
||||
int rptSz = seq->repeatSize_;
|
||||
int rptCnt = seq->repeatCount_;
|
||||
|
||||
for (int j = 0; j < rptCnt; j++) {
|
||||
for (int k = 0; k < rptSz; k++) {
|
||||
seq = packetSequenceList_.at(i+k);
|
||||
Q_ASSERT(seq->packets_);
|
||||
if (d >= seq->packets_) {
|
||||
// All packets of this seq were sent
|
||||
StreamStatsIterator iter(seq->streamStatsMeta_);
|
||||
while (iter.hasNext()) {
|
||||
iter.next();
|
||||
uint guid = iter.key();
|
||||
StreamStatsTuple ssm = iter.value();
|
||||
streamStats_[guid].tx_pkts += ssm.tx_pkts;
|
||||
streamStats_[guid].tx_bytes += ssm.tx_bytes;
|
||||
}
|
||||
d -= seq->packets_;
|
||||
}
|
||||
else { // (d < seq->packets_)
|
||||
// not all packets of this seq were sent, so we need to
|
||||
// traverse this seq upto 'd' pkts, parse guid from the
|
||||
// packet and update streamStats
|
||||
struct pcap_pkthdr *hdr =
|
||||
(struct pcap_pkthdr*) seq->sendQueue_->buffer;
|
||||
char *end = seq->sendQueue_->buffer + seq->sendQueue_->len;
|
||||
|
||||
while(d && ((char*) hdr < end)) {
|
||||
uchar *pkt = (uchar*)hdr + sizeof(*hdr);
|
||||
uint guid;
|
||||
|
||||
if (SignProtocol::packetGuid(pkt, hdr->caplen, &guid)) {
|
||||
streamStats_[guid].tx_pkts++;
|
||||
streamStats_[guid].tx_bytes += hdr->caplen;
|
||||
}
|
||||
|
||||
// Step to the next packet in the buffer
|
||||
hdr = (struct pcap_pkthdr*) (pkt + hdr->caplen);
|
||||
d--;
|
||||
}
|
||||
Q_ASSERT(d == 0);
|
||||
goto _done;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Move to the next Packet Set
|
||||
i += rptSz;
|
||||
}
|
||||
|
||||
_done:
|
||||
return;
|
||||
}
|
||||
|
||||
void PcapTxThread::udelay(unsigned long usec)
|
||||
{
|
||||
#if defined(Q_OS_WIN32)
|
||||
LARGE_INTEGER tgtTicks;
|
||||
LARGE_INTEGER curTicks;
|
||||
|
||||
QueryPerformanceCounter(&curTicks);
|
||||
tgtTicks.QuadPart = curTicks.QuadPart + (usec*gTicksFreq)/1000000;
|
||||
|
||||
while (curTicks.QuadPart < tgtTicks.QuadPart)
|
||||
QueryPerformanceCounter(&curTicks);
|
||||
#elif defined(Q_OS_LINUX)
|
||||
struct timeval delay, target, now;
|
||||
|
||||
//qDebug("usec delay = %ld", usec);
|
||||
|
||||
delay.tv_sec = 0;
|
||||
delay.tv_usec = usec;
|
||||
|
||||
while (delay.tv_usec >= 1000000)
|
||||
{
|
||||
delay.tv_sec++;
|
||||
delay.tv_usec -= 1000000;
|
||||
}
|
||||
|
||||
gettimeofday(&now, NULL);
|
||||
timeradd(&now, &delay, &target);
|
||||
|
||||
do {
|
||||
gettimeofday(&now, NULL);
|
||||
} while (timercmp(&now, &target, <));
|
||||
#else
|
||||
QThread::usleep(usec);
|
||||
#endif
|
||||
}
|
||||
|
98
server/pcaptxthread.h
Normal file
98
server/pcaptxthread.h
Normal file
@ -0,0 +1,98 @@
|
||||
/*
|
||||
Copyright (C) 2010-2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _PCAP_TX_THREAD_H
|
||||
#define _PCAP_TX_THREAD_H
|
||||
|
||||
#include "abstractport.h"
|
||||
#include "packetsequence.h"
|
||||
#include "statstuple.h"
|
||||
|
||||
#include <QThread>
|
||||
#include <pcap.h>
|
||||
|
||||
class PcapTxThread: public QThread
|
||||
{
|
||||
public:
|
||||
PcapTxThread(const char *device);
|
||||
~PcapTxThread();
|
||||
|
||||
bool setRateAccuracy(AbstractPort::Accuracy accuracy);
|
||||
bool setStreamStatsTracking(bool enable);
|
||||
|
||||
void clearPacketList();
|
||||
void loopNextPacketSet(qint64 size, qint64 repeats,
|
||||
long repeatDelaySec, long repeatDelayNsec);
|
||||
bool appendToPacketList(long sec, long usec, const uchar *packet,
|
||||
int length);
|
||||
void setPacketListLoopMode(bool loop, quint64 secDelay, quint64 nsecDelay);
|
||||
|
||||
void setHandle(pcap_t *handle);
|
||||
|
||||
void setStats(StatsTuple *stats);
|
||||
|
||||
const StreamStats& streamStats();
|
||||
void clearStreamStats();
|
||||
|
||||
void run();
|
||||
|
||||
void start();
|
||||
void stop();
|
||||
bool isRunning();
|
||||
|
||||
private:
|
||||
enum State
|
||||
{
|
||||
kNotStarted,
|
||||
kRunning,
|
||||
kFinished
|
||||
};
|
||||
|
||||
static void udelay(unsigned long usec);
|
||||
int sendQueueTransmit(pcap_t *p, pcap_send_queue *queue, long &overHead,
|
||||
int sync);
|
||||
void updateStreamStats();
|
||||
|
||||
// Intermediate state variables used while building the packet list
|
||||
PacketSequence *currentPacketSequence_;
|
||||
int repeatSequenceStart_;
|
||||
quint64 repeatSize_;
|
||||
quint64 packetCount_;
|
||||
|
||||
QList<PacketSequence*> packetSequenceList_;
|
||||
quint64 packetListSize_; // count of pkts in packet List including repeats
|
||||
|
||||
int returnToQIdx_;
|
||||
quint64 loopDelay_;
|
||||
|
||||
void (*udelayFn_)(unsigned long);
|
||||
|
||||
bool usingInternalHandle_;
|
||||
pcap_t *handle_;
|
||||
volatile bool stop_;
|
||||
volatile State state_;
|
||||
|
||||
bool trackStreamStats_;
|
||||
StatsTuple *stats_;
|
||||
StatsTuple lastStats_;
|
||||
StreamStats streamStats_;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
31
server/statstuple.h
Normal file
31
server/statstuple.h
Normal file
@ -0,0 +1,31 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _STATS_TUPLE_H
|
||||
#define _STATS_TUPLE_H
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
struct StatsTuple
|
||||
{
|
||||
quint64 pkts;
|
||||
quint64 bytes;
|
||||
};
|
||||
|
||||
#endif
|
36
server/streamstats.h
Normal file
36
server/streamstats.h
Normal file
@ -0,0 +1,36 @@
|
||||
/*
|
||||
Copyright (C) 2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _STREAM_STATS_H
|
||||
#define _STREAM_STATS_H
|
||||
|
||||
#include <QHash>
|
||||
|
||||
struct StreamStatsTuple
|
||||
{
|
||||
quint64 rx_pkts;
|
||||
quint64 rx_bytes;
|
||||
quint64 tx_pkts;
|
||||
quint64 tx_bytes;
|
||||
};
|
||||
|
||||
typedef QHash<uint, StreamStatsTuple> StreamStats;
|
||||
typedef QHashIterator<uint, StreamStatsTuple> StreamStatsIterator;
|
||||
|
||||
#endif
|
72
server/timestamp.h
Normal file
72
server/timestamp.h
Normal file
@ -0,0 +1,72 @@
|
||||
/*
|
||||
Copyright (C) 2010-2016 Srivats P.
|
||||
|
||||
This file is part of "Ostinato"
|
||||
|
||||
This 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/>
|
||||
*/
|
||||
|
||||
#ifndef _TIMESTAMP_H
|
||||
#define _TIMESTAMP_H
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
#if defined(Q_OS_LINUX)
|
||||
typedef struct timeval TimeStamp;
|
||||
static void inline getTimeStamp(TimeStamp *stamp)
|
||||
{
|
||||
gettimeofday(stamp, NULL);
|
||||
}
|
||||
|
||||
// Returns time diff in usecs between end and start
|
||||
static long inline udiffTimeStamp(const TimeStamp *start, const TimeStamp *end)
|
||||
{
|
||||
struct timeval diff;
|
||||
long usecs;
|
||||
|
||||
timersub(end, start, &diff);
|
||||
|
||||
usecs = diff.tv_usec;
|
||||
if (diff.tv_sec)
|
||||
usecs += diff.tv_sec*1e6;
|
||||
|
||||
return usecs;
|
||||
}
|
||||
#elif defined(Q_OS_WIN32)
|
||||
static quint64 gTicksFreq;
|
||||
typedef LARGE_INTEGER TimeStamp;
|
||||
static void inline getTimeStamp(TimeStamp* stamp)
|
||||
{
|
||||
QueryPerformanceCounter(stamp);
|
||||
}
|
||||
|
||||
static long inline udiffTimeStamp(const TimeStamp *start, const TimeStamp *end)
|
||||
{
|
||||
if (end->QuadPart >= start->QuadPart)
|
||||
return (end->QuadPart - start->QuadPart)*long(1e6)/gTicksFreq;
|
||||
else
|
||||
{
|
||||
// FIXME: incorrect! what's the max value for this counter before
|
||||
// it rolls over?
|
||||
return (start->QuadPart)*long(1e6)/gTicksFreq;
|
||||
}
|
||||
}
|
||||
#else
|
||||
typedef int TimeStamp;
|
||||
static void inline getTimeStamp(TimeStamp*) {}
|
||||
static long inline udiffTimeStamp(const TimeStamp*, const TimeStamp*) { return 0; }
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
46
test/TODO.md
46
test/TODO.md
@ -1,46 +0,0 @@
|
||||
# TODO - Test Cases
|
||||
|
||||
## Session Save/Open
|
||||
* Verify save session prompts before opening Save Dialog about only reserved ports being saved if there are some reserved ports and not prompted at all if no ports are reserved
|
||||
* Verify each save session triggers the file dialog at the last path used
|
||||
* Verify saved session file is correct
|
||||
* All portgroups are saved
|
||||
* All suitable (wrt reservation) ports are saved
|
||||
* All port configuration is saved
|
||||
* For each port -
|
||||
* All streams are saved with correct contents
|
||||
* All deviceGroups are saved with correct contents
|
||||
* OSSN Session file format tests (TODO: expand)
|
||||
* Verify no file is saved if user clicks 'Cancel' on the progress dialog while saving session file
|
||||
|
||||
* On open session, verify user is prompted before opening the file dialog if there are existing portgroups and not prompted at all if there are no port groups
|
||||
* Verify each open session triggers the file dialog at the last path used
|
||||
* Verify open file dialog file filter has `(*.ssn *.*)`
|
||||
* Verify opening a unsupported format file triggers an error and existing session is not changed
|
||||
* Verify all existing portgroups are removed before new ones from the file are created and configured
|
||||
* Verify that only ports in the opened session file are overwritten and other ports are not changed
|
||||
* Verify that if port in the opened session file was reserved at save time, and the same port is now reserved by someone else, it is not changed and user is informed; if current port reservation is by self, port is overwritten with contents from the session file; all reservations made by open session are with self username, not the username who had reserved the port during save time (in other words, allow session files to be exchanged between users)
|
||||
* Verify no unnecessary RPCs during open session
|
||||
* if port has no existing streams, deleteStreams() is not invoked
|
||||
* if port has no existing deviceGroups, deleteDeviceGroups() is not invoked
|
||||
* if port config has no change, modifyPort() is not invoked
|
||||
* if opened port has no streams, addStreams()/modifyStreams() is not invoked
|
||||
* if opened port has no deviceGroups, addDeviceGroups()/modifyDeviceGroups() is not invoked
|
||||
* Verify open session is successful
|
||||
* All streams are restored with correct contents
|
||||
* All deviceGroups are restored with correct contents
|
||||
* Port config (TxMode, ExclusiveMode, UserName) is changed, if required
|
||||
* OSSN Session file format tests (TODO: expand)
|
||||
* Verify no change in existing port groups if user clicks 'Cancel' on the options dialog
|
||||
* Verify no change in existing port groups if user clicks 'Cancel' on the progress dialog while opening session file
|
||||
* Verify all old portgroups are removed before new portgroups from the session file are added
|
||||
* Verify config of portGroups loaded from the session file are correct
|
||||
* Verify config of a portGroup is NOT restored to the config saved in session file after a open session - disconnect - connect
|
||||
|
||||
## Streams Save/Open
|
||||
* Verify save file dialog file filter has all supported types but no `*.*`
|
||||
* Stream file format tests (TODO: expand)
|
||||
|
||||
* Verify open file dialog file filter has all supported types except `*.py` and `*.*`
|
||||
* Verify opening a unsupported format file triggers an error and existing streams are not changed
|
||||
* Stream file format tests (TODO: expand)
|
1384
test/emultest.py
1384
test/emultest.py
File diff suppressed because it is too large
Load Diff
@ -1,61 +0,0 @@
|
||||
#! /usr/bin/env python
|
||||
|
||||
class Test:
|
||||
pass
|
||||
|
||||
class TestSuite:
|
||||
def __init__(self):
|
||||
self.results = []
|
||||
self.total = 0
|
||||
self.passed = 0
|
||||
self.completed = False
|
||||
|
||||
def test_begin(self, name):
|
||||
test = Test()
|
||||
test.name = name
|
||||
test.passed = False
|
||||
self.running = test
|
||||
print('-----------------------------------------------------------')
|
||||
print('@@TEST: %s' % name)
|
||||
print('-----------------------------------------------------------')
|
||||
|
||||
def test_end(self, result):
|
||||
if self.running:
|
||||
self.running.passed = result
|
||||
self.results.append(self.running)
|
||||
self.total = self.total + 1
|
||||
if result:
|
||||
self.passed = self.passed + 1
|
||||
self.running = None
|
||||
print('@@RESULT: %s' % ('PASS' if result else 'FAIL'))
|
||||
else:
|
||||
raise Exception('Test end without a test begin')
|
||||
|
||||
def report(self):
|
||||
print('===========================================================')
|
||||
print('TEST REPORT')
|
||||
print('===========================================================')
|
||||
for test in self.results:
|
||||
print('%d: %s' % (test.passed, test.name))
|
||||
print('Passed: %d/%d' % (self.passed, self.total))
|
||||
print('Completed: %d' % (self.completed))
|
||||
|
||||
def complete(self):
|
||||
self.completed = True
|
||||
|
||||
def passed(self):
|
||||
return passed == total and self.completed
|
||||
|
||||
class TestPreRequisiteError(Exception):
|
||||
def __init__(self, msg):
|
||||
self.msg = msg
|
||||
def __str__(self):
|
||||
return self.msg
|
||||
|
||||
def extract_column(text, col):
|
||||
"""Given a text table, return items in the specified column as a list"""
|
||||
lines = text.splitlines()
|
||||
cols = []
|
||||
for line in lines:
|
||||
cols.append(line.split(None, col)[col-1])
|
||||
return cols
|
@ -1,308 +0,0 @@
|
||||
#! /usr/bin/env python
|
||||
|
||||
# standard modules
|
||||
import logging
|
||||
import os
|
||||
import pytest
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
from harness import extract_column
|
||||
from utils import get_tshark
|
||||
|
||||
sys.path.insert(1, '../binding')
|
||||
from core import ost_pb, DroneProxy
|
||||
from rpc import RpcError
|
||||
#from protocols.mac_pb2 import mac
|
||||
#from protocols.payload_pb2 import payload, Payload
|
||||
|
||||
# initialize defaults
|
||||
host_name = '127.0.0.1'
|
||||
tx_number = -1
|
||||
rx_number = -1
|
||||
|
||||
tshark = get_tshark(minversion='1.2.0')
|
||||
|
||||
fmt = 'column.format:"Packet#","%m","Time","%t","Source","%uns","Destination","%und","Protocol","%p","Size","%L","Info","%i","Expert","%a"'
|
||||
fmt_col = 7 # col# in fmt for Size/PktLength
|
||||
|
||||
# setup protocol number dictionary
|
||||
proto_number = {}
|
||||
proto_number['mac'] = ost_pb.Protocol.kMacFieldNumber
|
||||
proto_number['vlan'] = ost_pb.Protocol.kVlanFieldNumber
|
||||
proto_number['eth2'] = ost_pb.Protocol.kEth2FieldNumber
|
||||
proto_number['ip4'] = ost_pb.Protocol.kIp4FieldNumber
|
||||
proto_number['ip6'] = ost_pb.Protocol.kIp6FieldNumber
|
||||
proto_number['udp'] = ost_pb.Protocol.kUdpFieldNumber
|
||||
proto_number['payload'] = ost_pb.Protocol.kPayloadFieldNumber
|
||||
|
||||
# setup logging
|
||||
log = logging.getLogger(__name__)
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
print('')
|
||||
print('This test uses the following topology -')
|
||||
print('')
|
||||
print(' +-------+ ')
|
||||
print(' | |Tx--->----+')
|
||||
print(' | Drone | |')
|
||||
print(' | |Rx---<----+')
|
||||
print(' +-------+ ')
|
||||
print('')
|
||||
print('A loopback port is used as both the Tx and Rx ports')
|
||||
print('')
|
||||
|
||||
@pytest.fixture(scope='module')
|
||||
def drone(request):
|
||||
"""Baseline Configuration for all testcases in this module"""
|
||||
|
||||
dut = DroneProxy(host_name)
|
||||
|
||||
log.info('connecting to drone(%s:%d)' % (dut.hostName(), dut.portNumber()))
|
||||
dut.connect()
|
||||
|
||||
def fin():
|
||||
dut.disconnect()
|
||||
|
||||
request.addfinalizer(fin)
|
||||
|
||||
return dut
|
||||
|
||||
@pytest.fixture(scope='module')
|
||||
def ports(request, drone):
|
||||
# retreive port id list
|
||||
log.info('retreiving port list')
|
||||
port_id_list = drone.getPortIdList()
|
||||
|
||||
# retreive port config list
|
||||
log.info('retreiving port config for all ports')
|
||||
port_config_list = drone.getPortConfig(port_id_list)
|
||||
|
||||
if len(port_config_list.port) == 0:
|
||||
log.warning('drone has no ports!')
|
||||
sys.exit(1)
|
||||
|
||||
# iterate port list to find a loopback port to use as the tx/rx port id
|
||||
print('Port List')
|
||||
print('---------')
|
||||
for port in port_config_list.port:
|
||||
print('%d.%s (%s)' % (port.port_id.id, port.name, port.description))
|
||||
# use a loopback port as default tx/rx port
|
||||
if ('lo' in port.name or 'loopback' in port.description.lower()):
|
||||
tx_number = port.port_id.id
|
||||
rx_number = port.port_id.id
|
||||
|
||||
if tx_number < 0 or rx_number < 0:
|
||||
log.warning('loopback port not found')
|
||||
sys.exit(1)
|
||||
|
||||
print('Using port %d as tx/rx port(s)' % tx_number)
|
||||
|
||||
ports.tx = ost_pb.PortIdList()
|
||||
ports.tx.port_id.add().id = tx_number;
|
||||
|
||||
ports.rx = ost_pb.PortIdList()
|
||||
ports.rx.port_id.add().id = rx_number;
|
||||
|
||||
# stop transmit/capture on ports, if any
|
||||
drone.stopTransmit(ports.tx)
|
||||
drone.stopCapture(ports.rx)
|
||||
|
||||
# delete existing streams, if any, on tx port
|
||||
sid_list = drone.getStreamIdList(ports.tx.port_id[0])
|
||||
drone.deleteStream(sid_list)
|
||||
|
||||
return ports
|
||||
|
||||
@pytest.fixture(scope='module')
|
||||
def stream(request, drone, ports):
|
||||
global proto_number
|
||||
|
||||
# add a stream
|
||||
stream_id = ost_pb.StreamIdList()
|
||||
stream_id.port_id.CopyFrom(ports.tx.port_id[0])
|
||||
stream_id.stream_id.add().id = 1
|
||||
log.info('adding tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.addStream(stream_id)
|
||||
|
||||
# configure the stream
|
||||
stream_cfg = ost_pb.StreamConfigList()
|
||||
stream_cfg.port_id.CopyFrom(ports.tx.port_id[0])
|
||||
s = stream_cfg.stream.add()
|
||||
s.stream_id.id = stream_id.stream_id[0].id
|
||||
s.core.is_enabled = True
|
||||
s.control.packets_per_sec = 100
|
||||
s.control.num_packets = 10
|
||||
|
||||
# XXX: don't setup any stream protocols
|
||||
|
||||
def fin():
|
||||
# delete streams
|
||||
log.info('deleting tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.deleteStream(stream_id)
|
||||
|
||||
request.addfinalizer(fin)
|
||||
|
||||
return stream_cfg
|
||||
|
||||
protolist=['mac eth2 ip4 udp payload', 'mac eth2 ip4 udp']
|
||||
@pytest.fixture(scope='module', params=protolist)
|
||||
def stream_toggle_payload(request, drone, ports):
|
||||
global proto_number
|
||||
|
||||
# add a stream
|
||||
stream_id = ost_pb.StreamIdList()
|
||||
stream_id.port_id.CopyFrom(ports.tx.port_id[0])
|
||||
stream_id.stream_id.add().id = 1
|
||||
log.info('adding tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.addStream(stream_id)
|
||||
|
||||
# configure the stream
|
||||
stream_cfg = ost_pb.StreamConfigList()
|
||||
stream_cfg.port_id.CopyFrom(ports.tx.port_id[0])
|
||||
s = stream_cfg.stream.add()
|
||||
s.stream_id.id = stream_id.stream_id[0].id
|
||||
s.core.is_enabled = True
|
||||
s.control.packets_per_sec = 100
|
||||
s.control.num_packets = 10
|
||||
|
||||
# setup stream protocols
|
||||
s.ClearField("protocol")
|
||||
protos = request.param.split()
|
||||
for p in protos:
|
||||
s.protocol.add().protocol_id.id = proto_number[p]
|
||||
|
||||
def fin():
|
||||
# delete streams
|
||||
log.info('deleting tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.deleteStream(stream_id)
|
||||
|
||||
request.addfinalizer(fin)
|
||||
|
||||
return stream_cfg
|
||||
|
||||
@pytest.mark.parametrize("mode", [
|
||||
ost_pb.StreamCore.e_fl_inc,
|
||||
ost_pb.StreamCore.e_fl_dec,
|
||||
ost_pb.StreamCore.e_fl_random
|
||||
])
|
||||
def test_framelen_modes(drone, ports, stream_toggle_payload, mode):
|
||||
""" Test various framelen modes """
|
||||
|
||||
min_pkt_len = 100
|
||||
max_pkt_len = 1000
|
||||
stream = stream_toggle_payload
|
||||
stream.stream[0].core.len_mode = mode
|
||||
stream.stream[0].core.frame_len_min = min_pkt_len
|
||||
stream.stream[0].core.frame_len_max = max_pkt_len
|
||||
|
||||
log.info('configuring tx_stream %d' % stream.stream[0].stream_id.id)
|
||||
drone.modifyStream(stream)
|
||||
|
||||
if stream.stream[0].protocol[-1].protocol_id.id \
|
||||
== ost_pb.Protocol.kPayloadFieldNumber:
|
||||
filter = 'udp && !expert.severity'
|
||||
else:
|
||||
filter = 'udp && eth.fcs_bad==1' \
|
||||
'&& ip.checksum_bad==0 && udp.checksum_bad==0'
|
||||
|
||||
# clear tx/rx stats
|
||||
log.info('clearing tx/rx stats')
|
||||
drone.clearStats(ports.tx)
|
||||
drone.clearStats(ports.rx)
|
||||
|
||||
try:
|
||||
drone.startCapture(ports.rx)
|
||||
drone.startTransmit(ports.tx)
|
||||
log.info('waiting for transmit to finish ...')
|
||||
time.sleep(3)
|
||||
drone.stopTransmit(ports.tx)
|
||||
drone.stopCapture(ports.rx)
|
||||
|
||||
log.info('getting Rx capture buffer')
|
||||
buff = drone.getCaptureBuffer(ports.rx.port_id[0])
|
||||
drone.saveCaptureBuffer(buff, 'capture.pcap')
|
||||
log.info('dumping Rx capture buffer')
|
||||
cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap'])
|
||||
print(cap_pkts)
|
||||
print(filter)
|
||||
cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap',
|
||||
'-Y', filter, '-o', fmt])
|
||||
print(cap_pkts)
|
||||
assert cap_pkts.count('\n') == stream.stream[0].control.num_packets
|
||||
result = extract_column(cap_pkts, fmt_col)
|
||||
print(result)
|
||||
diffSum = 0
|
||||
for i in range(len(result)):
|
||||
l = int(result[i]) + 4 # add FCS to length
|
||||
assert (l >= min_pkt_len) and (l <= max_pkt_len)
|
||||
|
||||
# check current packet length to last
|
||||
if (i > 0):
|
||||
ll = int(result[i-1]) + 4
|
||||
if mode == ost_pb.StreamCore.e_fl_inc:
|
||||
assert l == (ll+1)
|
||||
elif mode == ost_pb.StreamCore.e_fl_dec:
|
||||
assert l == (ll-1)
|
||||
elif mode == ost_pb.StreamCore.e_fl_random:
|
||||
diffSum += (l-ll)
|
||||
|
||||
# TODO: find a better way to check for randomness
|
||||
if mode == ost_pb.StreamCore.e_fl_random:
|
||||
assert (diffSum % (len(result) - 1)) != 0
|
||||
|
||||
os.remove('capture.pcap')
|
||||
except RpcError as e:
|
||||
raise
|
||||
finally:
|
||||
drone.stopTransmit(ports.tx)
|
||||
|
||||
def test_frame_trunc(drone, ports, stream):
|
||||
""" Test frame is truncated even if the protocol sizes exceed framelen """
|
||||
|
||||
#stream.stream[0].core.frame_len_min = min_pkt_len
|
||||
|
||||
# setup stream protocols as mac:vlan:eth2:ip6:udp:payload
|
||||
stream.stream[0].ClearField("protocol")
|
||||
protos = ['mac', 'vlan', 'eth2', 'ip6', 'udp', 'payload']
|
||||
for p in protos:
|
||||
stream.stream[0].protocol.add().protocol_id.id = proto_number[p]
|
||||
|
||||
# note: unless truncated minimum size of payload protocol is 1
|
||||
exp_framelen = min(12+4+2+40+8+1, 60)
|
||||
|
||||
log.info('configuring tx_stream %d' % stream.stream[0].stream_id.id)
|
||||
drone.modifyStream(stream)
|
||||
|
||||
# clear tx/rx stats
|
||||
log.info('clearing tx/rx stats')
|
||||
drone.clearStats(ports.tx)
|
||||
drone.clearStats(ports.rx)
|
||||
|
||||
try:
|
||||
drone.startCapture(ports.rx)
|
||||
drone.startTransmit(ports.tx)
|
||||
log.info('waiting for transmit to finish ...')
|
||||
time.sleep(3)
|
||||
drone.stopTransmit(ports.tx)
|
||||
drone.stopCapture(ports.rx)
|
||||
|
||||
log.info('getting Rx capture buffer')
|
||||
buff = drone.getCaptureBuffer(ports.rx.port_id[0])
|
||||
drone.saveCaptureBuffer(buff, 'capture.pcap')
|
||||
log.info('dumping Rx capture buffer')
|
||||
cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap',
|
||||
'-Y', 'vlan', '-o', fmt])
|
||||
print(cap_pkts)
|
||||
assert cap_pkts.count('\n') == stream.stream[0].control.num_packets
|
||||
result = extract_column(cap_pkts, fmt_col)
|
||||
print(result)
|
||||
for i in range(len(result)):
|
||||
assert (int(result[i]) == exp_framelen)
|
||||
|
||||
os.remove('capture.pcap')
|
||||
except RpcError as e:
|
||||
raise
|
||||
finally:
|
||||
drone.stopTransmit(ports.tx)
|
@ -1,3 +0,0 @@
|
||||
[pytest]
|
||||
; change file glob pattern after converting old test files to pytest
|
||||
python_files=pktlentest.py
|
558
test/rpctest.py
558
test/rpctest.py
@ -1,558 +0,0 @@
|
||||
#! /usr/bin/env python
|
||||
|
||||
# standard modules
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
sys.path.insert(1, '../binding')
|
||||
import core
|
||||
from core import ost_pb, DroneProxy
|
||||
from rpc import RpcError
|
||||
from protocols.mac_pb2 import mac
|
||||
from protocols.ip4_pb2 import ip4, Ip4
|
||||
|
||||
class Test:
|
||||
pass
|
||||
|
||||
class TestSuite:
|
||||
def __init__(self):
|
||||
self.results = []
|
||||
self.total = 0
|
||||
self.passed = 0
|
||||
self.completed = False
|
||||
|
||||
def test_begin(self, name):
|
||||
test = Test()
|
||||
test.name = name
|
||||
test.passed = False
|
||||
self.running = test
|
||||
print('-----------------------------------------------------------')
|
||||
print('@@TEST: %s' % name)
|
||||
print('-----------------------------------------------------------')
|
||||
|
||||
def test_end(self, result):
|
||||
if self.running:
|
||||
self.running.passed = result
|
||||
self.results.append(self.running)
|
||||
self.total = self.total + 1
|
||||
if result:
|
||||
self.passed = self.passed + 1
|
||||
self.running = None
|
||||
print('@@RESULT: %s' % ('PASS' if result else 'FAIL'))
|
||||
else:
|
||||
raise Exception('Test end without a test begin')
|
||||
|
||||
def report(self):
|
||||
print('===========================================================')
|
||||
print('TEST REPORT')
|
||||
print('===========================================================')
|
||||
for test in self.results:
|
||||
print('%s: %d' % (test.name, test.passed))
|
||||
print('Passed: %d/%d' % (self.passed, self.total))
|
||||
print('Completed: %d' % (self.completed))
|
||||
|
||||
def complete(self):
|
||||
self.completed = True
|
||||
|
||||
def passed(self):
|
||||
return passed == total and self.completed
|
||||
|
||||
# initialize defaults
|
||||
host_name = '127.0.0.1'
|
||||
tx_port_number = -1
|
||||
rx_port_number = -1
|
||||
drone_version = ['0', '0', '0']
|
||||
|
||||
if sys.platform == 'win32':
|
||||
tshark = r'C:\Program Files\Wireshark\tshark.exe'
|
||||
else:
|
||||
tshark = 'tshark'
|
||||
|
||||
|
||||
# setup logging
|
||||
log = logging.getLogger(__name__)
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
print('')
|
||||
print('This test uses the following topology -')
|
||||
print('')
|
||||
print(' +-------+ ')
|
||||
print(' | |Tx--->----+')
|
||||
print(' | Drone | |')
|
||||
print(' | |Rx---<----+')
|
||||
print(' +-------+ ')
|
||||
print('')
|
||||
print('A loopback port is used as both the Tx and Rx ports')
|
||||
print('')
|
||||
|
||||
suite = TestSuite()
|
||||
drone = DroneProxy(host_name)
|
||||
|
||||
try:
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify any RPC before checkVersion() fails and the server
|
||||
# closes the connection
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('anyRpcBeforeCheckVersionFails')
|
||||
drone.channel.connect(drone.host, drone.port)
|
||||
try:
|
||||
port_id_list = drone.getPortIdList()
|
||||
except RpcError as e:
|
||||
if ('compatibility check pending' in str(e)):
|
||||
passed = True
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
drone.channel.disconnect()
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify DroneProxy.connect() fails for incompatible version
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('connectFailsForIncompatibleVersion')
|
||||
try:
|
||||
orig_version = core.__version__
|
||||
core.__version__ = '0.1.1'
|
||||
drone.connect()
|
||||
except RpcError as e:
|
||||
if ('needs client version' in str(e)):
|
||||
passed = True
|
||||
drone_version = str(e).split()[-1].split('.')
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
core.__version__ = orig_version
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify checkVersion() fails for invalid client version format
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('checkVersionFailsForInvalidClientVersion')
|
||||
try:
|
||||
orig_version = core.__version__
|
||||
core.__version__ = '0-1-1'
|
||||
drone.connect()
|
||||
except RpcError as e:
|
||||
if ('invalid version' in str(e)):
|
||||
passed = True
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
core.__version__ = orig_version
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify checkVersion() returns incompatible if the 'major'
|
||||
# part of the <major.minor.revision> numbering format is
|
||||
# different than the server's version and the server closes
|
||||
# the connection
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('checkVersionReturnsIncompatForDifferentMajorVersion')
|
||||
try:
|
||||
orig_version = core.__version__
|
||||
core.__version__ = (str(int(drone_version[0])+1)
|
||||
+ '.' + drone_version[1])
|
||||
drone.connect()
|
||||
except RpcError as e:
|
||||
#FIXME: How to check for a closed connection?
|
||||
if ('needs client version' in str(e)):
|
||||
passed = True
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
core.__version__ = orig_version
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify checkVersion() returns incompatible if the 'minor'
|
||||
# part of the <major.minor.revision> numbering format is
|
||||
# different than the server's version and the server closes
|
||||
# the connection
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('checkVersionReturnsIncompatForDifferentMinorVersion')
|
||||
try:
|
||||
orig_version = core.__version__
|
||||
core.__version__ = (drone_version[0]
|
||||
+ '.' + str(int(drone_version[1])+1))
|
||||
drone.connect()
|
||||
except RpcError as e:
|
||||
#FIXME: How to check for a closed connection?
|
||||
if ('needs client version' in str(e)):
|
||||
passed = True
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
core.__version__ = orig_version
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify checkVersion() returns compatible if the 'revision'
|
||||
# part of the <major.minor.revision> numbering format is
|
||||
# different than the server's version
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('checkVersionReturnsCompatForDifferentRevisionVersion')
|
||||
try:
|
||||
orig_version = core.__version__
|
||||
core.__version__ = (drone_version[0]
|
||||
+ '.' + drone_version[1]
|
||||
+ '.' + '999')
|
||||
drone.connect()
|
||||
passed = True
|
||||
except RpcError as e:
|
||||
raise
|
||||
finally:
|
||||
drone.disconnect()
|
||||
core.__version__ = orig_version
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# Baseline Configuration for subsequent testcases
|
||||
# ----------------------------------------------------------------- #
|
||||
|
||||
# connect to drone
|
||||
log.info('connecting to drone(%s:%d)'
|
||||
% (drone.hostName(), drone.portNumber()))
|
||||
drone.connect()
|
||||
|
||||
# retreive port id list
|
||||
log.info('retreiving port list')
|
||||
port_id_list = drone.getPortIdList()
|
||||
|
||||
# retreive port config list
|
||||
log.info('retreiving port config for all ports')
|
||||
port_config_list = drone.getPortConfig(port_id_list)
|
||||
|
||||
if len(port_config_list.port) == 0:
|
||||
log.warning('drone has no ports!')
|
||||
sys.exit(1)
|
||||
|
||||
# iterate port list to find a loopback port to use as the tx/rx port id
|
||||
print('Port List')
|
||||
print('---------')
|
||||
for port in port_config_list.port:
|
||||
print('%d.%s (%s)' % (port.port_id.id, port.name, port.description))
|
||||
# use a loopback port as default tx/rx port
|
||||
if ('lo' in port.name or 'loopback' in port.description.lower()):
|
||||
tx_port_number = port.port_id.id
|
||||
rx_port_number = port.port_id.id
|
||||
|
||||
if tx_port_number < 0 or rx_port_number < 0:
|
||||
log.warning('loopback port not found')
|
||||
sys.exit(1)
|
||||
|
||||
print('Using port %d as tx/rx port(s)' % tx_port_number)
|
||||
|
||||
tx_port = ost_pb.PortIdList()
|
||||
tx_port.port_id.add().id = tx_port_number;
|
||||
|
||||
rx_port = ost_pb.PortIdList()
|
||||
rx_port.port_id.add().id = rx_port_number;
|
||||
|
||||
# add a stream
|
||||
stream_id = ost_pb.StreamIdList()
|
||||
stream_id.port_id.CopyFrom(tx_port.port_id[0])
|
||||
stream_id.stream_id.add().id = 1
|
||||
log.info('adding tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.addStream(stream_id)
|
||||
|
||||
# configure the stream
|
||||
stream_cfg = ost_pb.StreamConfigList()
|
||||
stream_cfg.port_id.CopyFrom(tx_port.port_id[0])
|
||||
s = stream_cfg.stream.add()
|
||||
s.stream_id.id = stream_id.stream_id[0].id
|
||||
s.core.is_enabled = True
|
||||
s.control.num_packets = 10
|
||||
|
||||
# setup stream protocols as mac:eth2:ip4:udp:payload
|
||||
p = s.protocol.add()
|
||||
p.protocol_id.id = ost_pb.Protocol.kMacFieldNumber
|
||||
p.Extensions[mac].dst_mac = 0x001122334455
|
||||
p.Extensions[mac].src_mac = 0x00aabbccddee
|
||||
|
||||
p = s.protocol.add()
|
||||
p.protocol_id.id = ost_pb.Protocol.kEth2FieldNumber
|
||||
|
||||
p = s.protocol.add()
|
||||
p.protocol_id.id = ost_pb.Protocol.kIp4FieldNumber
|
||||
# reduce typing by creating a shorter reference to p.Extensions[ip4]
|
||||
ip = p.Extensions[ip4]
|
||||
ip.src_ip = 0x01020304
|
||||
ip.dst_ip = 0x05060708
|
||||
ip.dst_ip_mode = Ip4.e_im_inc_host
|
||||
|
||||
s.protocol.add().protocol_id.id = ost_pb.Protocol.kUdpFieldNumber
|
||||
s.protocol.add().protocol_id.id = ost_pb.Protocol.kPayloadFieldNumber
|
||||
|
||||
log.info('configuring tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.modifyStream(stream_cfg)
|
||||
|
||||
# clear tx/rx stats
|
||||
log.info('clearing tx/rx stats')
|
||||
drone.clearStats(tx_port)
|
||||
drone.clearStats(rx_port)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify a RPC with missing required fields in request fails
|
||||
# and subsequently passes when the fields are initialized
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('rpcWithMissingRequiredFieldsFails')
|
||||
pid = ost_pb.PortId()
|
||||
try:
|
||||
sid_list = drone.getStreamIdList(pid)
|
||||
except RpcError as e:
|
||||
if ('missing required fields in request' in str(e)):
|
||||
passed = True
|
||||
log.info("Retrying RPC after adding the missing fields")
|
||||
pid.id = tx_port_number
|
||||
try:
|
||||
sid_list = drone.getStreamIdList(pid)
|
||||
except:
|
||||
passed = False
|
||||
raise
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify invoking addStream() during transmit fails
|
||||
# TESTCASE: Verify invoking modifyStream() during transmit fails
|
||||
# TESTCASE: Verify invoking deleteStream() during transmit fails
|
||||
# ----------------------------------------------------------------- #
|
||||
sid = ost_pb.StreamIdList()
|
||||
sid.port_id.CopyFrom(tx_port.port_id[0])
|
||||
sid.stream_id.add().id = 2
|
||||
|
||||
passed = False
|
||||
suite.test_begin('addStreamDuringTransmitFails')
|
||||
drone.startTransmit(tx_port)
|
||||
try:
|
||||
log.info('adding tx_stream %d' % sid.stream_id[0].id)
|
||||
drone.addStream(sid)
|
||||
except RpcError as e:
|
||||
if ('Port Busy' in str(e)):
|
||||
passed = True
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
drone.stopTransmit(tx_port)
|
||||
suite.test_end(passed)
|
||||
|
||||
passed = False
|
||||
suite.test_begin('modifyStreamDuringTransmitFails')
|
||||
scfg = ost_pb.StreamConfigList()
|
||||
scfg.port_id.CopyFrom(tx_port.port_id[0])
|
||||
s = scfg.stream.add()
|
||||
s.stream_id.id = sid.stream_id[0].id
|
||||
s.protocol.add().protocol_id.id = ost_pb.Protocol.kMacFieldNumber
|
||||
s.protocol.add().protocol_id.id = ost_pb.Protocol.kArpFieldNumber
|
||||
s.protocol.add().protocol_id.id = ost_pb.Protocol.kPayloadFieldNumber
|
||||
drone.startTransmit(tx_port)
|
||||
try:
|
||||
log.info('configuring tx_stream %d' % sid.stream_id[0].id)
|
||||
drone.modifyStream(scfg)
|
||||
except RpcError as e:
|
||||
if ('Port Busy' in str(e)):
|
||||
passed = True
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
drone.stopTransmit(tx_port)
|
||||
suite.test_end(passed)
|
||||
|
||||
passed = False
|
||||
suite.test_begin('deleteStreamDuringTransmitFails')
|
||||
drone.startTransmit(tx_port)
|
||||
try:
|
||||
log.info('deleting tx_stream %d' % sid.stream_id[0].id)
|
||||
drone.deleteStream(sid)
|
||||
except RpcError as e:
|
||||
if ('Port Busy' in str(e)):
|
||||
passed = True
|
||||
else:
|
||||
raise
|
||||
finally:
|
||||
drone.stopTransmit(tx_port)
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify invoking startTransmit() during transmit is a NOP,
|
||||
# not a restart
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('startTransmitDuringTransmitIsNopNotRestart')
|
||||
drone.startCapture(rx_port)
|
||||
drone.startTransmit(tx_port)
|
||||
try:
|
||||
log.info('sleeping for 4s ...')
|
||||
time.sleep(4)
|
||||
log.info('starting transmit multiple times')
|
||||
drone.startTransmit(tx_port)
|
||||
time.sleep(1)
|
||||
drone.startTransmit(tx_port)
|
||||
time.sleep(1)
|
||||
drone.startTransmit(tx_port)
|
||||
time.sleep(1)
|
||||
log.info('waiting for transmit to finish ...')
|
||||
time.sleep(5)
|
||||
drone.stopTransmit(tx_port)
|
||||
drone.stopCapture(rx_port)
|
||||
|
||||
buff = drone.getCaptureBuffer(rx_port.port_id[0])
|
||||
drone.saveCaptureBuffer(buff, 'capture.pcap')
|
||||
log.info('dumping Rx capture buffer')
|
||||
cap_pkts = subprocess.check_output([tshark, '-r', 'capture.pcap'])
|
||||
print(cap_pkts)
|
||||
if '5.6.7.8' in cap_pkts:
|
||||
passed = True
|
||||
os.remove('capture.pcap')
|
||||
except RpcError as e:
|
||||
raise
|
||||
finally:
|
||||
drone.stopTransmit(tx_port)
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify invoking startCapture() during capture is a NOP,
|
||||
# not a restart
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('startCaptureDuringTransmitIsNopNotRestart')
|
||||
try:
|
||||
drone.startCapture(rx_port)
|
||||
drone.startTransmit(tx_port)
|
||||
log.info('sleeping for 4s ...')
|
||||
time.sleep(4)
|
||||
log.info('starting capture multiple times')
|
||||
drone.startCapture(rx_port)
|
||||
time.sleep(1)
|
||||
drone.startCapture(rx_port)
|
||||
time.sleep(1)
|
||||
drone.startCapture(rx_port)
|
||||
time.sleep(1)
|
||||
log.info('waiting for transmit to finish ...')
|
||||
time.sleep(5)
|
||||
drone.stopTransmit(tx_port)
|
||||
drone.stopCapture(rx_port)
|
||||
|
||||
buff = drone.getCaptureBuffer(rx_port.port_id[0])
|
||||
drone.saveCaptureBuffer(buff, 'capture.pcap')
|
||||
log.info('dumping Rx capture buffer')
|
||||
cap_pkts = subprocess.check_output([tshark, '-r', 'capture.pcap'])
|
||||
print(cap_pkts)
|
||||
if '5.6.7.8' in cap_pkts:
|
||||
passed = True
|
||||
os.remove('capture.pcap')
|
||||
except RpcError as e:
|
||||
raise
|
||||
finally:
|
||||
drone.stopTransmit(tx_port)
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify invoking stopTransmit() when transmit is not running
|
||||
# is a NOP
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('stopTransmitWhenTransmitNotRunningIsNop')
|
||||
try:
|
||||
tx_stats = drone.getStats(tx_port)
|
||||
log.info('--> (tx_stats)' + tx_stats.__str__())
|
||||
if tx_stats.port_stats[0].state.is_transmit_on:
|
||||
raise Exception('Unexpected transmit ON state')
|
||||
log.info('stopping transmit multiple times')
|
||||
drone.stopTransmit(tx_port)
|
||||
time.sleep(1)
|
||||
drone.stopTransmit(tx_port)
|
||||
time.sleep(1)
|
||||
drone.stopTransmit(tx_port)
|
||||
|
||||
# if we reached here, that means there was no exception
|
||||
passed = True
|
||||
except RpcError as e:
|
||||
raise
|
||||
finally:
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify invoking stopCapture() when capture is not running
|
||||
# is a NOP
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('stopCaptureWhenCaptureNotRunningIsNop')
|
||||
try:
|
||||
rx_stats = drone.getStats(rx_port)
|
||||
log.info('--> (rx_stats)' + rx_stats.__str__())
|
||||
if rx_stats.port_stats[0].state.is_capture_on:
|
||||
raise Exception('Unexpected capture ON state')
|
||||
log.info('stopping capture multiple times')
|
||||
drone.stopCapture(rx_port)
|
||||
time.sleep(1)
|
||||
drone.stopCapture(rx_port)
|
||||
time.sleep(1)
|
||||
drone.stopCapture(rx_port)
|
||||
|
||||
# if we reached here, that means there was no exception
|
||||
passed = True
|
||||
except RpcError as e:
|
||||
raise
|
||||
finally:
|
||||
suite.test_end(passed)
|
||||
|
||||
# ----------------------------------------------------------------- #
|
||||
# TESTCASE: Verify startCapture(), startTransmit() sequence captures the
|
||||
# first packet
|
||||
# TESTCASE: Verify stopTransmit(), stopCapture() sequence captures the
|
||||
# last packet
|
||||
# ----------------------------------------------------------------- #
|
||||
passed = False
|
||||
suite.test_begin('startStopTransmitCaptureOrderCapturesAllPackets')
|
||||
try:
|
||||
drone.startCapture(rx_port)
|
||||
drone.startTransmit(tx_port)
|
||||
log.info('waiting for transmit to finish ...')
|
||||
time.sleep(12)
|
||||
drone.stopTransmit(tx_port)
|
||||
drone.stopCapture(rx_port)
|
||||
|
||||
log.info('getting Rx capture buffer')
|
||||
buff = drone.getCaptureBuffer(rx_port.port_id[0])
|
||||
drone.saveCaptureBuffer(buff, 'capture.pcap')
|
||||
log.info('dumping Rx capture buffer')
|
||||
cap_pkts = subprocess.check_output([tshark, '-r', 'capture.pcap'])
|
||||
print(cap_pkts)
|
||||
if '5.6.7.8' in cap_pkts and '5.6.7.17' in cap_pkts:
|
||||
passed = True
|
||||
os.remove('capture.pcap')
|
||||
except RpcError as e:
|
||||
raise
|
||||
finally:
|
||||
drone.stopTransmit(tx_port)
|
||||
suite.test_end(passed)
|
||||
|
||||
suite.complete()
|
||||
|
||||
# delete streams
|
||||
log.info('deleting tx_stream %d' % stream_id.stream_id[0].id)
|
||||
drone.deleteStream(stream_id)
|
||||
|
||||
# bye for now
|
||||
drone.disconnect()
|
||||
|
||||
except Exception as ex:
|
||||
log.exception(ex)
|
||||
|
||||
finally:
|
||||
suite.report()
|
||||
if not suite.passed:
|
||||
sys.exit(2);
|
@ -1,22 +0,0 @@
|
||||
#! /usr/bin/env python
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
#from distutils.spawn import find_executable
|
||||
from distutils.version import LooseVersion
|
||||
|
||||
def get_tshark(minversion = None):
|
||||
tshark = 'tshark'
|
||||
#if sys.platform == 'win32':
|
||||
# tshark = find_executable(tshark)
|
||||
if tshark and minversion:
|
||||
out = subprocess.check_output([tshark, '-v']).split(None, 2)
|
||||
# we expect output to be of the form 'Tshark <version> ..."
|
||||
ver = out[1]
|
||||
if LooseVersion(ver) < LooseVersion(minversion):
|
||||
tshark = None
|
||||
|
||||
if tshark is not None:
|
||||
print('%s version %s found' % (tshark, ver))
|
||||
return tshark
|
||||
|
1039
test/vftest.py
1039
test/vftest.py
File diff suppressed because it is too large
Load Diff
20
version.pri
20
version.pri
@ -20,23 +20,3 @@ ver_info {
|
||||
POST_TARGETDEPS += $$APP_VERSION_FILE
|
||||
QMAKE_DISTCLEAN += $$APP_VERSION_FILE
|
||||
}
|
||||
|
||||
pkg_info {
|
||||
PKG_INFO_FILE = pkg_info.json
|
||||
pkginfo.target = $$PKG_INFO_FILE
|
||||
pkginfo.CONFIG = recursive
|
||||
win32:pkginfo.commands = echo "{" \
|
||||
" \"version\": \"$$APP_VERSION\"," \
|
||||
" \"revision\": \"$$APP_REVISION\"" \
|
||||
"}" \
|
||||
> $$PKG_INFO_FILE
|
||||
unix:pkginfo.commands = echo "\"{" \
|
||||
" \\\"version\\\": \\\"$$APP_VERSION\\\"," \
|
||||
" \\\"revision\\\": \\\"$$APP_REVISION\\\"" \
|
||||
"}\"" \
|
||||
> $$PKG_INFO_FILE
|
||||
|
||||
QMAKE_EXTRA_TARGETS += pkginfo
|
||||
POST_TARGETDEPS += $$PKG_INFO_FILE
|
||||
QMAKE_DISTCLEAN += $$PKG_INFO_FILE
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user