Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1479] trunk
|
From: <xb...@us...> - 2012-09-21 09:47:45
|
Revision: 1479
http://scstudio.svn.sourceforge.net/scstudio/?rev=1479&view=rev
Author: xborza
Date: 2012-09-21 09:47:29 +0000 (Fri, 21 Sep 2012)
Log Message:
-----------
pcap comit > libraries
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/FindPCAP.cmake
trunk/src/data/CMakeLists.txt
trunk/src/data/pcap/CMakeLists.txt
trunk/src/data/pcap/flow_stats.h
trunk/src/data/pcap/pcap_load.cpp
trunk/src/data/pcap/pcap_load.h
trunk/tests/pcap/CMakeLists.txt
Added Paths:
-----------
trunk/third-party-sw/http_parser/
trunk/third-party-sw/http_parser/AUTHORS
trunk/third-party-sw/http_parser/CMakeLists.txt
trunk/third-party-sw/http_parser/LICENSE-MIT
trunk/third-party-sw/http_parser/Makefile
trunk/third-party-sw/http_parser/README.md
trunk/third-party-sw/http_parser/http_parser.c
trunk/third-party-sw/http_parser/http_parser.h
trunk/third-party-sw/http_parser/test.c
trunk/third-party-sw/http_parser/url_parser.c
trunk/third-party-sw/libosip2-3.6.0/
trunk/third-party-sw/libosip2-3.6.0/AUTHORS
trunk/third-party-sw/libosip2-3.6.0/BUGS
trunk/third-party-sw/libosip2-3.6.0/CMakeLists.txt
trunk/third-party-sw/libosip2-3.6.0/COPYING
trunk/third-party-sw/libosip2-3.6.0/ChangeLog
trunk/third-party-sw/libosip2-3.6.0/FEATURES
trunk/third-party-sw/libosip2-3.6.0/HISTORY
trunk/third-party-sw/libosip2-3.6.0/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/NEWS
trunk/third-party-sw/libosip2-3.6.0/README
trunk/third-party-sw/libosip2-3.6.0/TODO
trunk/third-party-sw/libosip2-3.6.0/aclocal.m4
trunk/third-party-sw/libosip2-3.6.0/autogen.sh
trunk/third-party-sw/libosip2-3.6.0/config.h.in
trunk/third-party-sw/libosip2-3.6.0/configure
trunk/third-party-sw/libosip2-3.6.0/configure.in
trunk/third-party-sw/libosip2-3.6.0/help/
trunk/third-party-sw/libosip2-3.6.0/help/INSTALL.bsd
trunk/third-party-sw/libosip2-3.6.0/help/INSTALL.linux
trunk/third-party-sw/libosip2-3.6.0/help/INSTALL.linuxe
trunk/third-party-sw/libosip2-3.6.0/help/INSTALL.unix
trunk/third-party-sw/libosip2-3.6.0/help/INSTALL.vxworks
trunk/third-party-sw/libosip2-3.6.0/help/INSTALL.win32
trunk/third-party-sw/libosip2-3.6.0/help/INSTALL.wince
trunk/third-party-sw/libosip2-3.6.0/help/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/help/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/DoxyFile
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/ht0-initialize.dox
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/ht1-uri.dox
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/ht2-parser.dox
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/ht3-fsm.dox
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/ht4-dialog.dox
trunk/third-party-sw/libosip2-3.6.0/help/doxygen/ht5-sdp.dox
trunk/third-party-sw/libosip2-3.6.0/help/man/
trunk/third-party-sw/libosip2-3.6.0/help/man/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/help/man/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/help/man/osip.1
trunk/third-party-sw/libosip2-3.6.0/help/man/osip.sgml
trunk/third-party-sw/libosip2-3.6.0/include/
trunk/third-party-sw/libosip2-3.6.0/include/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/include/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/include/osip2/
trunk/third-party-sw/libosip2-3.6.0/include/osip2/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/include/osip2/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/include/osip2/doxygen.dox.in
trunk/third-party-sw/libosip2-3.6.0/include/osip2/internal.h
trunk/third-party-sw/libosip2-3.6.0/include/osip2/osip.h
trunk/third-party-sw/libosip2-3.6.0/include/osip2/osip_condv.h
trunk/third-party-sw/libosip2-3.6.0/include/osip2/osip_dialog.h
trunk/third-party-sw/libosip2-3.6.0/include/osip2/osip_fifo.h
trunk/third-party-sw/libosip2-3.6.0/include/osip2/osip_mt.h
trunk/third-party-sw/libosip2-3.6.0/include/osip2/osip_time.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_accept.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_accept_encoding.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_accept_language.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_alert_info.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_allow.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_authentication_info.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_authorization.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_call_id.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_call_info.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_contact.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_content_disposition.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_content_encoding.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_content_length.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_content_type.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_cseq.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_error_info.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_from.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_header.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_mime_version.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_proxy_authenticate.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_proxy_authentication_info.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_proxy_authorization.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_record_route.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_route.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_to.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_via.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/headers/osip_www_authenticate.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_body.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_const.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_headers.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_list.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_md5.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_message.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_parser.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_port.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/osip_uri.h
trunk/third-party-sw/libosip2-3.6.0/include/osipparser2/sdp_message.h
trunk/third-party-sw/libosip2-3.6.0/libosip2.pc.in
trunk/third-party-sw/libosip2-3.6.0/platform/
trunk/third-party-sw/libosip2-3.6.0/platform/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/platform/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/platform/rpm/
trunk/third-party-sw/libosip2-3.6.0/platform/rpm/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/platform/rpm/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/platform/rpm/libosip.spec
trunk/third-party-sw/libosip2-3.6.0/platform/vsnet/
trunk/third-party-sw/libosip2-3.6.0/platform/vsnet/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/platform/vsnet/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/platform/vsnet/osip.sln
trunk/third-party-sw/libosip2-3.6.0/platform/vsnet/osip2.def
trunk/third-party-sw/libosip2-3.6.0/platform/vsnet/osip2.vcproj
trunk/third-party-sw/libosip2-3.6.0/platform/vsnet/osipparser2.def
trunk/third-party-sw/libosip2-3.6.0/platform/vsnet/osipparser2.vcproj
trunk/third-party-sw/libosip2-3.6.0/platform/wince/
trunk/third-party-sw/libosip2-3.6.0/platform/wince/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/platform/wince/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/platform/wince/osip2.vcproj
trunk/third-party-sw/libosip2-3.6.0/platform/wince/osipparser2.vcproj
trunk/third-party-sw/libosip2-3.6.0/scripts/
trunk/third-party-sw/libosip2-3.6.0/scripts/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/scripts/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/scripts/aclocal-include.m4
trunk/third-party-sw/libosip2-3.6.0/scripts/acx_pthread.m4
trunk/third-party-sw/libosip2-3.6.0/scripts/config.guess
trunk/third-party-sw/libosip2-3.6.0/scripts/config.sub
trunk/third-party-sw/libosip2-3.6.0/scripts/depcomp
trunk/third-party-sw/libosip2-3.6.0/scripts/install-sh
trunk/third-party-sw/libosip2-3.6.0/scripts/ltmain.sh
trunk/third-party-sw/libosip2-3.6.0/scripts/missing
trunk/third-party-sw/libosip2-3.6.0/scripts/mkinstalldirs
trunk/third-party-sw/libosip2-3.6.0/src/
trunk/third-party-sw/libosip2-3.6.0/src/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/src/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/src/osip2/
trunk/third-party-sw/libosip2-3.6.0/src/osip2/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/src/osip2/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/src/osip2/fsm.h
trunk/third-party-sw/libosip2-3.6.0/src/osip2/fsm_misc.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/ict.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/ict_fsm.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/ist.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/ist_fsm.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/nict.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/nict_fsm.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/nist.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/nist_fsm.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/osip.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/osip_dialog.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/osip_event.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/osip_time.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/osip_transaction.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/port_condv.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/port_fifo.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/port_sema.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/port_thread.c
trunk/third-party-sw/libosip2-3.6.0/src/osip2/xixt.h
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_accept.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_accept_encoding.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_accept_language.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_alert_info.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_allow.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_authentication_info.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_authorization.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_body.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_call_id.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_call_info.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_contact.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_content_disposition.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_content_encoding.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_content_length.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_content_type.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_cseq.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_error_info.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_from.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_header.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_list.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_md5c.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_message.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_message_parse.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_message_to_str.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_mime_version.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_parser_cfg.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_port.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_proxy_authenticate.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_proxy_authentication_info.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_proxy_authorization.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_record_route.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_route.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_to.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_uri.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_via.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/osip_www_authenticate.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/parser.h
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/sdp_accessor.c
trunk/third-party-sw/libosip2-3.6.0/src/osipparser2/sdp_message.c
trunk/third-party-sw/libosip2-3.6.0/src/test/
trunk/third-party-sw/libosip2-3.6.0/src/test/CHECK
trunk/third-party-sw/libosip2-3.6.0/src/test/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/src/test/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/src/test/res/
trunk/third-party-sw/libosip2-3.6.0/src/test/res/Makefile.am
trunk/third-party-sw/libosip2-3.6.0/src/test/res/Makefile.in
trunk/third-party-sw/libosip2-3.6.0/src/test/res/auths.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/callids.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/contacts.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/contenttypes.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/froms.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/recordroutes.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/routes.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp0
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp1
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp10
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp11
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp12
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp13
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp14
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp15
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp2
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp3
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp4
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp5
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp6
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp7
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp8
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sdp9
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip-malformed0
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip-malformed1
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip-malformed2
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip-malformed3
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip-malformed4
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip-malformed5
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip-malformed6
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip-malformed8
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip0
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip1
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip10
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip11
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip12
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip13
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip14
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip15
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip16
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip17
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip18
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip19
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip2
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip20
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip21
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip22
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip23
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip24
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip25
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip26
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip27
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip28
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip29
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip3
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip30
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip31
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip32
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip33
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip34
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip35
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip36
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip37
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip38
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip39
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip4
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip40
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip41
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip42
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip43
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip44
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip45
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip46
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip47
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip48
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip49
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip5
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip50
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip51
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip52
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip53
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip54
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip55
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip56
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip57
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip58
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip59
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip6
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip60
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip61
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip62
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip63
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip64
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip65
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip66
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip67
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip68
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip69
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip7
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip70
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip71
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip72
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip73
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip74
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip75
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip76
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip77
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip78
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip79
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip8
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip80
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip81
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip82
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip83
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip84
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip85
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip86
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip87
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip88
trunk/third-party-sw/libosip2-3.6.0/src/test/res/sip9
trunk/third-party-sw/libosip2-3.6.0/src/test/res/torture_hgs
trunk/third-party-sw/libosip2-3.6.0/src/test/res/torture_msgs2
trunk/third-party-sw/libosip2-3.6.0/src/test/res/torture_sdps
trunk/third-party-sw/libosip2-3.6.0/src/test/res/tos.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/urls.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/vias.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/res/wwwas.txt
trunk/third-party-sw/libosip2-3.6.0/src/test/tcallid.c
trunk/third-party-sw/libosip2-3.6.0/src/test/tcontact.c
trunk/third-party-sw/libosip2-3.6.0/src/test/tcontentt.c
trunk/third-party-sw/libosip2-3.6.0/src/test/tfrom.c
trunk/third-party-sw/libosip2-3.6.0/src/test/torture.c
trunk/third-party-sw/libosip2-3.6.0/src/test/trecordr.c
trunk/third-party-sw/libosip2-3.6.0/src/test/troute.c
trunk/third-party-sw/libosip2-3.6.0/src/test/tst
trunk/third-party-sw/libosip2-3.6.0/src/test/tto.c
trunk/third-party-sw/libosip2-3.6.0/src/test/turls.c
trunk/third-party-sw/libosip2-3.6.0/src/test/tvia.c
trunk/third-party-sw/libosip2-3.6.0/src/test/twwwa.c
trunk/third-party-sw/win_pcap/
trunk/third-party-sw/win_pcap/Examples-pcap/
trunk/third-party-sw/win_pcap/Examples-pcap/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/MakeaAll.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/MakeaAll.sln
trunk/third-party-sw/win_pcap/Examples-pcap/UDPdump/
trunk/third-party-sw/win_pcap/Examples-pcap/UDPdump/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/UDPdump/UDPdump.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/UDPdump/UDPdump.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/UDPdump/UDPdump.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/UDPdump/udpdump.c
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump/
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump/basic_dump.c
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump/basic_dump.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump/basic_dump.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump/basic_dump.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump_ex/
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump_ex/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump_ex/basic_dump_ex.c
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump_ex/basic_dump_ex.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump_ex/basic_dump_ex.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/basic_dump_ex/basic_dump_ex.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/iflist/
trunk/third-party-sw/win_pcap/Examples-pcap/iflist/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/iflist/iflist.c
trunk/third-party-sw/win_pcap/Examples-pcap/iflist/iflist.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/iflist/iflist.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/iflist/iflist.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/pcap_filter/
trunk/third-party-sw/win_pcap/Examples-pcap/pcap_filter/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/pcap_filter/Makefile.unix
trunk/third-party-sw/win_pcap/Examples-pcap/pcap_filter/pcap_filter.c
trunk/third-party-sw/win_pcap/Examples-pcap/pcap_filter/pcap_filter.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/pcap_filter/pcap_filter.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/pcap_filter/pcap_filter.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/pktdump_ex/
trunk/third-party-sw/win_pcap/Examples-pcap/pktdump_ex/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/pktdump_ex/pktdump_ex.c
trunk/third-party-sw/win_pcap/Examples-pcap/pktdump_ex/pktdump_ex.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/pktdump_ex/pktdump_ex.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/pktdump_ex/pktdump_ex.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/readfile/
trunk/third-party-sw/win_pcap/Examples-pcap/readfile/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/readfile/readfile.c
trunk/third-party-sw/win_pcap/Examples-pcap/readfile/readfile.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/readfile/readfile.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/readfile/readfile.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/readfile_ex/
trunk/third-party-sw/win_pcap/Examples-pcap/readfile_ex/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/readfile_ex/readfile_ex.c
trunk/third-party-sw/win_pcap/Examples-pcap/readfile_ex/readfile_ex.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/readfile_ex/readfile_ex.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/readfile_ex/readfile_ex.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/savedump/
trunk/third-party-sw/win_pcap/Examples-pcap/savedump/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/savedump/savedump.c
trunk/third-party-sw/win_pcap/Examples-pcap/savedump/savedump.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/savedump/savedump.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/savedump/savedump.vcproj
trunk/third-party-sw/win_pcap/Examples-pcap/sendpack/
trunk/third-party-sw/win_pcap/Examples-pcap/sendpack/GNUmakefile
trunk/third-party-sw/win_pcap/Examples-pcap/sendpack/sendpack.c
trunk/third-party-sw/win_pcap/Examples-pcap/sendpack/sendpack.dsp
trunk/third-party-sw/win_pcap/Examples-pcap/sendpack/sendpack.dsw
trunk/third-party-sw/win_pcap/Examples-pcap/sendpack/sendpack.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/
trunk/third-party-sw/win_pcap/Examples-remote/MakeAll.sln
trunk/third-party-sw/win_pcap/Examples-remote/MakeaAll.dsw
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/GetMacAddress/
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/GetMacAddress/GetMacAddress.c
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/GetMacAddress/GetMacAddress.dsp
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/GetMacAddress/GetMacAddress.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/TestPacketCapture/
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/TestPacketCapture/TestPacketCapture.c
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/TestPacketCapture/TestPacketCapture.dsp
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/TestPacketCapture/TestPacketCapture.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/TestPacketSend/
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/TestPacketSend/TestPacketSend.c
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/TestPacketSend/TestPacketSend.dsp
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/TestPacketSend/TestPacketSend.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/PacketDriver/readme.txt
trunk/third-party-sw/win_pcap/Examples-remote/UDPdump/
trunk/third-party-sw/win_pcap/Examples-remote/UDPdump/UDPdump.dsp
trunk/third-party-sw/win_pcap/Examples-remote/UDPdump/UDPdump.dsw
trunk/third-party-sw/win_pcap/Examples-remote/UDPdump/UDPdump.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/UDPdump/udpdump.c
trunk/third-party-sw/win_pcap/Examples-remote/UserLevelBridge/
trunk/third-party-sw/win_pcap/Examples-remote/UserLevelBridge/UserBridge.c
trunk/third-party-sw/win_pcap/Examples-remote/UserLevelBridge/UserBridge.dsp
trunk/third-party-sw/win_pcap/Examples-remote/UserLevelBridge/UserBridge.dsw
trunk/third-party-sw/win_pcap/Examples-remote/UserLevelBridge/UserBridge.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/iflist/
trunk/third-party-sw/win_pcap/Examples-remote/iflist/iflist.c
trunk/third-party-sw/win_pcap/Examples-remote/iflist/iflist.dsp
trunk/third-party-sw/win_pcap/Examples-remote/iflist/iflist.dsw
trunk/third-party-sw/win_pcap/Examples-remote/iflist/iflist.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/misc/
trunk/third-party-sw/win_pcap/Examples-remote/misc/MakeAll.sln
trunk/third-party-sw/win_pcap/Examples-remote/misc/MakeaAll.dsw
trunk/third-party-sw/win_pcap/Examples-remote/misc/basic_dump.c
trunk/third-party-sw/win_pcap/Examples-remote/misc/basic_dump.dsp
trunk/third-party-sw/win_pcap/Examples-remote/misc/basic_dump.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/misc/basic_dump_ex.c
trunk/third-party-sw/win_pcap/Examples-remote/misc/basic_dump_ex.dsp
trunk/third-party-sw/win_pcap/Examples-remote/misc/basic_dump_ex.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/misc/readfile.c
trunk/third-party-sw/win_pcap/Examples-remote/misc/readfile.dsp
trunk/third-party-sw/win_pcap/Examples-remote/misc/readfile.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/misc/readfile_ex.c
trunk/third-party-sw/win_pcap/Examples-remote/misc/readfile_ex.dsp
trunk/third-party-sw/win_pcap/Examples-remote/misc/readfile_ex.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/misc/savedump.c
trunk/third-party-sw/win_pcap/Examples-remote/misc/savedump.dsp
trunk/third-party-sw/win_pcap/Examples-remote/misc/savedump.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/misc/sendpack.c
trunk/third-party-sw/win_pcap/Examples-remote/misc/sendpack.dsp
trunk/third-party-sw/win_pcap/Examples-remote/misc/sendpack.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/pcap_filter/
trunk/third-party-sw/win_pcap/Examples-remote/pcap_filter/pcap_filter.c
trunk/third-party-sw/win_pcap/Examples-remote/pcap_filter/pcap_filter.dsp
trunk/third-party-sw/win_pcap/Examples-remote/pcap_filter/pcap_filter.dsw
trunk/third-party-sw/win_pcap/Examples-remote/pcap_filter/pcap_filter.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/pcap_fopen/
trunk/third-party-sw/win_pcap/Examples-remote/pcap_fopen/pcap_fopen.cpp
trunk/third-party-sw/win_pcap/Examples-remote/pcap_fopen/pcap_fopen.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/pktdump_ex/
trunk/third-party-sw/win_pcap/Examples-remote/pktdump_ex/pktdump_ex.c
trunk/third-party-sw/win_pcap/Examples-remote/pktdump_ex/pktdump_ex.dsp
trunk/third-party-sw/win_pcap/Examples-remote/pktdump_ex/pktdump_ex.dsw
trunk/third-party-sw/win_pcap/Examples-remote/pktdump_ex/pktdump_ex.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/sendcap/
trunk/third-party-sw/win_pcap/Examples-remote/sendcap/sencap.dsw
trunk/third-party-sw/win_pcap/Examples-remote/sendcap/sendcap.c
trunk/third-party-sw/win_pcap/Examples-remote/sendcap/sendcap.dsp
trunk/third-party-sw/win_pcap/Examples-remote/sendcap/sendcap.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/smp_1/
trunk/third-party-sw/win_pcap/Examples-remote/smp_1/smp_1.c
trunk/third-party-sw/win_pcap/Examples-remote/smp_1/smp_1.dsp
trunk/third-party-sw/win_pcap/Examples-remote/smp_1/smp_1.dsw
trunk/third-party-sw/win_pcap/Examples-remote/smp_1/smp_1.vcproj
trunk/third-party-sw/win_pcap/Examples-remote/tcptop/
trunk/third-party-sw/win_pcap/Examples-remote/tcptop/tcptop.c
trunk/third-party-sw/win_pcap/Examples-remote/tcptop/tcptop.dsp
trunk/third-party-sw/win_pcap/Examples-remote/tcptop/tcptop.dsw
trunk/third-party-sw/win_pcap/Examples-remote/tcptop/tcptop.vcproj
trunk/third-party-sw/win_pcap/Packet32.h
trunk/third-party-sw/win_pcap/Win32-Extensions.h
trunk/third-party-sw/win_pcap/bittypes.h
trunk/third-party-sw/win_pcap/ip6_misc.h
trunk/third-party-sw/win_pcap/lib/
trunk/third-party-sw/win_pcap/lib/Packet.lib
trunk/third-party-sw/win_pcap/lib/wpcap.lib
trunk/third-party-sw/win_pcap/lib64/
trunk/third-party-sw/win_pcap/lib64/Packet.lib
trunk/third-party-sw/win_pcap/lib64/wpcap.lib
trunk/third-party-sw/win_pcap/pcap/
trunk/third-party-sw/win_pcap/pcap/bluetooth.h
trunk/third-party-sw/win_pcap/pcap/bpf.h
trunk/third-party-sw/win_pcap/pcap/namedb.h
trunk/third-party-sw/win_pcap/pcap/pcap.h
trunk/third-party-sw/win_pcap/pcap/sll.h
trunk/third-party-sw/win_pcap/pcap/usb.h
trunk/third-party-sw/win_pcap/pcap/vlan.h
trunk/third-party-sw/win_pcap/pcap-bpf.h
trunk/third-party-sw/win_pcap/pcap-namedb.h
trunk/third-party-sw/win_pcap/pcap-stdinc.h
trunk/third-party-sw/win_pcap/pcap.h
trunk/third-party-sw/win_pcap/remote-ext.h
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2012-09-11 16:54:19 UTC (rev 1478)
+++ trunk/CMakeLists.txt 2012-09-21 09:47:29 UTC (rev 1479)
@@ -82,7 +82,19 @@
FIND_PACKAGE(ANTLR_default)
ENDIF(WIN32)
+#pcap setup
+OPTION(BUILD_PCAP "Enable to build the PCAP import module" OFF)
+IF(BUILD_PCAP)
+ SET(OSIP_ROOT "${CMAKE_SOURCE_DIR}/third-party-sw/libosip2-3.6.0" CACHE PATH
+ "The SIP parser root." )
+ ADD_SUBDIRECTORY(${OSIP_ROOT})
+ SET(HTTP_ROOT "${CMAKE_SOURCE_DIR}/third-party-sw/http_parser" CACHE PATH
+ "The HTTP parser root.")
+ ADD_SUBDIRECTORY(${HTTP_ROOT})
+ FIND_PACKAGE(PCAP)
+ENDIF(BUILD_PCAP)
+
INCLUDE_DIRECTORIES(src)
INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/include)
Modified: trunk/FindPCAP.cmake
===================================================================
--- trunk/FindPCAP.cmake 2012-09-11 16:54:19 UTC (rev 1478)
+++ trunk/FindPCAP.cmake 2012-09-21 09:47:29 UTC (rev 1479)
@@ -1,13 +1,23 @@
# set the default PCAP_ROOT value
+
IF(NOT PCAP_ROOT)
- SET(PCAP_ROOT "${CMAKE_SOURCE_DIR}/third-party-sw/pcap" CACHE PATH "The LPSOLVE directory root.")
- SET(PCAP_ROOT $ENV{PCAP_ROOT} CACHE PATH "The PCAP directory root.")
+ IF(WIN32)
+ SET(PCAP_ROOT "${CMAKE_SOURCE_DIR}/third-party-sw/win_pcap" CACHE PATH "The PCAP directory root.")
+ ELSE(WIN32)
+ SET(PCAP_ROOT "${CMAKE_SOURCE_DIR}/third-party-sw/pcap" CACHE PATH "The PCAP directory root.")
+ ENDIF(WIN32)
+# set explicit pcap root
+ IF(ENV{PCAP_ROOT})
+ SET(PCAP_ROOT $ENV{PCAP_ROOT} CACHE PATH "The user defined PCAP directory root.")
+ ENDIF(ENV{PCAP_ROOT})
ENDIF(NOT PCAP_ROOT)
FIND_LIBRARY(PCAP_LIBRARY
- NAMES pcap
+ NAMES wpcap libpcap
PATHS
${PCAP_ROOT}/lib
+ ${PCAP_ROOT}/lib${ARCHITECTURE_PTR_SIZE}
+ NO_DEFAULT_PATH
DOC "The PCAP library")
FIND_PATH(PCAP_INCLUDE_DIR
@@ -19,3 +29,6 @@
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCAP DEFAULT_MSG
PCAP_LIBRARY PCAP_INCLUDE_DIR)
+
+#set the default HTTP_ROOT value
+
Modified: trunk/src/data/CMakeLists.txt
===================================================================
--- trunk/src/data/CMakeLists.txt 2012-09-11 16:54:19 UTC (rev 1478)
+++ trunk/src/data/CMakeLists.txt 2012-09-21 09:47:29 UTC (rev 1479)
@@ -52,7 +52,6 @@
ADD_SUBDIRECTORY(beautify)
ADD_SUBDIRECTORY(time_relevant_ordering)
-OPTION(BUILD_PCAP "Enable to build the PCAP import module" OFF)
IF(BUILD_PCAP)
ADD_SUBDIRECTORY(pcap)
ENDIF(BUILD_PCAP)
Modified: trunk/src/data/pcap/CMakeLists.txt
===================================================================
--- trunk/src/data/pcap/CMakeLists.txt 2012-09-11 16:54:19 UTC (rev 1478)
+++ trunk/src/data/pcap/CMakeLists.txt 2012-09-21 09:47:29 UTC (rev 1479)
@@ -1,14 +1,27 @@
-FIND_PACKAGE(PCAP REQUIRED)
+#FIND_PACKAGE(PCAP REQUIRED)
-INCLUDE_DIRECTORIES(${PCAP_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${PCAP_INCLUDE_DIR} ${OSIP_ROOT}/include ${HTTP_ROOT})
ADD_LIBRARY(scpcap SHARED
export.h
- pcap_struct.h
- pcap_struct.cpp
+ bytes.h
module.cpp
pcap_load.h
pcap_load.cpp
+ pcap_struct.h
+ pcap_struct.cpp
+ flow_stats.h
+ flow_stats.cpp
+ flow.h
+ flow.cpp
+ ethernet_layer.h
+ ethernet_layer.cpp
+ internet_layer.h
+ internet_layer.cpp
+ transport_layer.h
+ transport_layer.cpp
+ application_layer.h
+ application_layer.cpp
# arp.cpp
# ethernet.cpp
# icmp.cpp
@@ -21,4 +34,6 @@
scmsc
ws2_32
${PCAP_LIBRARY}
+ http_parser
+ osipparser2
)
Modified: trunk/src/data/pcap/flow_stats.h
===================================================================
--- trunk/src/data/pcap/flow_stats.h 2012-09-11 16:54:19 UTC (rev 1478)
+++ trunk/src/data/pcap/flow_stats.h 2012-09-21 09:47:29 UTC (rev 1479)
@@ -42,6 +42,12 @@
}
};
+// in windows.h are included "min" and "max" macros -> collision with std::min, std::max
+#ifdef WIN32
+#undef min
+#undef max
+#endif
+
struct ports_struct{
u_short src;
u_short dst;
Modified: trunk/src/data/pcap/pcap_load.cpp
===================================================================
--- trunk/src/data/pcap/pcap_load.cpp 2012-09-11 16:54:19 UTC (rev 1478)
+++ trunk/src/data/pcap/pcap_load.cpp 2012-09-21 09:47:29 UTC (rev 1479)
@@ -21,6 +21,7 @@
// under UN*X libpcap http://www.tcpdump.org
#include "pcap_load.h"
+#include <pcap.h>
// SET THE FILTER
const char* sip_filter = "(tcp || udp) && (port 5060 || port 5061)";
Modified: trunk/src/data/pcap/pcap_load.h
===================================================================
--- trunk/src/data/pcap/pcap_load.h 2012-09-11 16:54:19 UTC (rev 1478)
+++ trunk/src/data/pcap/pcap_load.h 2012-09-21 09:47:29 UTC (rev 1479)
@@ -23,7 +23,8 @@
#define uint16_t UINT16
#define uint32_t UINT32
-#include <WinSock2.h>
+#include <WinSock2.h>
+//#define NOMINMAX // for using MIN and MAX from algorithm
#include <Windows.h>
#endif
@@ -33,6 +34,7 @@
#define HAVE_REMOTE
#define IPTOSBUFFERS 12
+#include <pcap.h>
#include "pcap_struct.h"
#include "data/pcap/export.h"
Modified: trunk/tests/pcap/CMakeLists.txt
===================================================================
--- trunk/tests/pcap/CMakeLists.txt 2012-09-11 16:54:19 UTC (rev 1478)
+++ trunk/tests/pcap/CMakeLists.txt 2012-09-21 09:47:29 UTC (rev 1479)
@@ -4,7 +4,7 @@
pcap_test.cpp
)
-INCLUDE_DIRECTORIES(${PCAP_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${PCAP_INCLUDE_DIR} ${OSIP_ROOT}/include ${HTTP_ROOT})
TARGET_LINK_LIBRARIES(pcap_test
scpcap
Added: trunk/third-party-sw/http_parser/AUTHORS
===================================================================
--- trunk/third-party-sw/http_parser/AUTHORS (rev 0)
+++ trunk/third-party-sw/http_parser/AUTHORS 2012-09-21 09:47:29 UTC (rev 1479)
@@ -0,0 +1,37 @@
+# Authors ordered by first contribution.
+Ryan Dahl <ry...@ti...>
+Jeremy Hinegardner <je...@hi...>
+Sergey Shepelev <te...@gm...>
+Joe Damato <ic...@gm...>
+tomika <tom...@fr...>
+Phoenix Sol <ph...@bu...>
+Cliff Frey <cl...@me...>
+Ewen Cheslack-Postava <ew...@cs...>
+Santiago Gala <sg...@ap...>
+Tim Becker <tim...@sy...>
+Jeff Terrace <jte...@gm...>
+Ben Noordhuis <in...@bn...>
+Nathan Rajlich <na...@to...>
+Mark Nottingham <mn...@mn...>
+Aman Gupta <am...@tm...>
+Tim Becker <tim...@ku...>
+Sean Cunningham <sea...@ma...>
+Peter Griess <pg...@st...>
+Salman Haq <sal...@as...>
+Cliff Frey <cli...@gm...>
+Jon Kolb <jo...@b0...>
+Fouad Mardini <f.m...@gm...>
+Paul Querna <pq...@ap...>
+Felix Geisendörfer <fe...@de...>
+koichik <ko...@im...>
+Andre Caron <and...@gm...>
+Ivo Raisr <iv...@iv...>
+James McLaughlin <ja...@la...>
+David Gwynne <lo...@an...>
+LE ROUX Thomas <th...@pr...>
+Randy Rizun <rr...@or...>
+Andre Louis Caron <and...@us...>
+Simon Zimmermann <sim...@gm...>
+Erik Dubbelboer <er...@du...>
+Martell Malone <mar...@gm...>
+Bertrand Paquet <bp...@oc...>
Added: trunk/third-party-sw/http_parser/CMakeLists.txt
===================================================================
--- trunk/third-party-sw/http_parser/CMakeLists.txt (rev 0)
+++ trunk/third-party-sw/http_parser/CMakeLists.txt 2012-09-21 09:47:29 UTC (rev 1479)
@@ -0,0 +1,10 @@
+ADD_LIBRARY(http_parser STATIC
+ http_parser.h
+ http_parser.c
+)
+
+set_target_properties(http_parser PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
+
+
+
Added: trunk/third-party-sw/http_parser/LICENSE-MIT
===================================================================
--- trunk/third-party-sw/http_parser/LICENSE-MIT (rev 0)
+++ trunk/third-party-sw/http_parser/LICENSE-MIT 2012-09-21 09:47:29 UTC (rev 1479)
@@ -0,0 +1,23 @@
+http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
+Igor Sysoev.
+
+Additional changes are licensed under the same terms as NGINX and
+copyright Joyent, Inc. and other Node contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
Added: trunk/third-party-sw/http_parser/Makefile
===================================================================
--- trunk/third-party-sw/http_parser/Makefile (rev 0)
+++ trunk/third-party-sw/http_parser/Makefile 2012-09-21 09:47:29 UTC (rev 1479)
@@ -0,0 +1,64 @@
+CC?=gcc
+AR?=ar
+
+CPPFLAGS += -I.
+CPPFLAGS_DEBUG = $(CPPFLAGS) -DHTTP_PARSER_STRICT=1 -DHTTP_PARSER_DEBUG=1
+CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA)
+CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0 -DHTTP_PARSER_DEBUG=0
+CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
+
+CFLAGS += -Wall -Wextra -Werror
+CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
+CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
+CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
+
+test: test_g test_fast
+ ./test_g
+ ./test_fast
+
+test_g: http_parser_g.o test_g.o
+ $(CC) $(CFLAGS_DEBUG) $(LDFLAGS) http_parser_g.o test_g.o -o $@
+
+test_g.o: test.c http_parser.h Makefile
+ $(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c test.c -o $@
+
+http_parser_g.o: http_parser.c http_parser.h Makefile
+ $(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c http_parser.c -o $@
+
+test_fast: http_parser.o test.o http_parser.h
+ $(CC) $(CFLAGS_FAST) $(LDFLAGS) http_parser.o test.o -o $@
+
+test.o: test.c http_parser.h Makefile
+ $(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c test.c -o $@
+
+url_parser: http_parser_g.o url_parser.o
+ $(CC) $(CFLAGS_DEBUG) $(LDFLAGS) http_parser_g.o url_parser.o -o $@
+
+url_parser.o: url_parser.c http_parser.h Makefile
+ $(CC) $(CPPFLAGS_DEBUG) $(CFLAGS_DEBUG) -c url_parser.c -o $@
+
+http_parser.o: http_parser.c http_parser.h Makefile
+ $(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) -c http_parser.c
+
+test-run-timed: test_fast
+ while(true) do time ./test_fast > /dev/null; done
+
+test-valgrind: test_g
+ valgrind ./test_g
+
+libhttp_parser.o: http_parser.c http_parser.h Makefile
+ $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o
+
+library: libhttp_parser.o
+ $(CC) -shared -o libhttp_parser.so libhttp_parser.o
+
+package: http_parser.o
+ $(AR) rcs libhttp_parser.a http_parser.o
+
+tags: http_parser.c http_parser.h test.c
+ ctags $^
+
+clean:
+ rm -f *.o *.a test test_fast test_g url_parser http_parser.tar tags libhttp_parser.so libhttp_parser.o
+
+.PHONY: clean package test-run test-run-timed test-valgrind
Added: trunk/third-party-sw/http_parser/README.md
===================================================================
--- trunk/third-party-sw/http_parser/README.md (rev 0)
+++ trunk/third-party-sw/http_parser/README.md 2012-09-21 09:47:29 UTC (rev 1479)
@@ -0,0 +1,178 @@
+HTTP Parser
+===========
+
+This is a parser for HTTP messages written in C. It parses both requests and
+responses. The parser is designed to be used in performance HTTP
+applications. It does not make any syscalls nor allocations, it does not
+buffer data, it can be interrupted at anytime. Depending on your
+architecture, it only requires about 40 bytes of data per message
+stream (in a web server that is per connection).
+
+Features:
+
+ * No dependencies
+ * Handles persistent streams (keep-alive).
+ * Decodes chunked encoding.
+ * Upgrade support
+ * Defends against buffer overflow attacks.
+
+The parser extracts the following information from HTTP messages:
+
+ * Header fields and values
+ * Content-Length
+ * Request method
+ * Response status code
+ * Transfer-Encoding
+ * HTTP version
+ * Request URL
+ * Message body
+
+
+Usage
+-----
+
+One `http_parser` object is used per TCP connection. Initialize the struct
+using `http_parser_init()` and set the callbacks. That might look something
+like this for a request parser:
+
+ http_parser_settings settings;
+ settings.on_path = my_path_callback;
+ settings.on_header_field = my_header_field_callback;
+ /* ... */
+
+ http_parser *parser = malloc(sizeof(http_parser));
+ http_parser_init(parser, HTTP_REQUEST);
+ parser->data = my_socket;
+
+When data is received on the socket execute the parser and check for errors.
+
+ size_t len = 80*1024, nparsed;
+ char buf[len];
+ ssize_t recved;
+
+ recved = recv(fd, buf, len, 0);
+
+ if (recved < 0) {
+ /* Handle error. */
+ }
+
+ /* Start up / continue the parser.
+ * Note we pass recved==0 to signal that EOF has been recieved.
+ */
+ nparsed = http_parser_execute(parser, &settings, buf, recved);
+
+ if (parser->upgrade) {
+ /* handle new protocol */
+ } else if (nparsed != recved) {
+ /* Handle error. Usually just close the connection. */
+ }
+
+HTTP needs to know where the end of the stream is. For example, sometimes
+servers send responses without Content-Length and expect the client to
+consume input (for the body) until EOF. To tell http_parser about EOF, give
+`0` as the forth parameter to `http_parser_execute()`. Callbacks and errors
+can still be encountered during an EOF, so one must still be prepared
+to receive them.
+
+Scalar valued message information such as `status_code`, `method`, and the
+HTTP version are stored in the parser structure. This data is only
+temporally stored in `http_parser` and gets reset on each new message. If
+this information is needed later, copy it out of the structure during the
+`headers_complete` callback.
+
+The parser decodes the transfer-encoding for both requests and responses
+transparently. That is, a chunked encoding is decoded before being sent to
+the on_body callback.
+
+
+The Special Problem of Upgrade
+------------------------------
+
+HTTP supports upgrading the connection to a different protocol. An
+increasingly common example of this is the Web Socket protocol which sends
+a request like
+
+ GET /demo HTTP/1.1
+ Upgrade: WebSocket
+ Connection: Upgrade
+ Host: example.com
+ Origin: http://example.com
+ WebSocket-Protocol: sample
+
+followed by non-HTTP data.
+
+(See http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75 for more
+information the Web Socket protocol.)
+
+To support this, the parser will treat this as a normal HTTP message without a
+body. Issuing both on_headers_complete and on_message_complete callbacks. However
+http_parser_execute() will stop parsing at the end of the headers and return.
+
+The user is expected to check if `parser->upgrade` has been set to 1 after
+`http_parser_execute()` returns. Non-HTTP data begins at the buffer supplied
+offset by the return value of `http_parser_execute()`.
+
+
+Callbacks
+---------
+
+During the `http_parser_execute()` call, the callbacks set in
+`http_parser_settings` will be executed. The parser maintains state and
+never looks behind, so buffering the data is not necessary. If you need to
+save certain data for later usage, you can do that from the callbacks.
+
+There are two types of callbacks:
+
+* notification `typedef int (*http_cb) (http_parser*);`
+ Callbacks: on_message_begin, on_headers_complete, on_message_complete.
+* data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
+ Callbacks: (requests only) on_uri,
+ (common) on_header_field, on_header_value, on_body;
+
+Callbacks must return 0 on success. Returning a non-zero value indicates
+error to the parser, making it exit immediately.
+
+In case you parse HTTP message in chunks (i.e. `read()` request line
+from socket, parse, read half headers, parse, etc) your data callbacks
+may be called more than once. Http-parser guarantees that data pointer is only
+valid for the lifetime of callback. You can also `read()` into a heap allocated
+buffer to avoid copying memory around if this fits your application.
+
+Reading headers may be a tricky task if you read/parse headers partially.
+Basically, you need to remember whether last header callback was field or value
+and apply following logic:
+
+ (on_header_field and on_header_value shortened to on_h_*)
+ ------------------------ ------------ --------------------------------------------
+ | State (prev. callback) | Callback | Description/action |
+ ------------------------ ------------ --------------------------------------------
+ | nothing (first call) | on_h_field | Allocate new buffer and copy callback data |
+ | | | into it |
+ ------------------------ ------------ --------------------------------------------
+ | value | on_h_field | New header started. |
+ | | | Copy current name,value buffers to headers |
+ | | | list and allocate new buffer for new name |
+ ------------------------ ------------ --------------------------------------------
+ | field | on_h_field | Previous name continues. Reallocate name |
+ | | | buffer and append callback data to it |
+ ------------------------ ------------ --------------------------------------------
+ | field | on_h_value | Value for current header started. Allocate |
+ | | | new buffer and copy callback data to it |
+ ------------------------ ------------ --------------------------------------------
+ | value | on_h_value | Value continues. Reallocate value buffer |
+ | | | and append callback data to it |
+ ------------------------ ------------ --------------------------------------------
+
+
+Parsing URLs
+------------
+
+A simplistic zero-copy URL parser is provided as `http_parser_parse_url()`.
+Users of this library may wish to use it to parse URLs constructed from
+consecutive `on_url` callbacks.
+
+See examples of reading in headers:
+
+* [partial example](http://gist.github.com/155877) in C
+* [from http-parser tests](http://github.com/joyent/http-parser/blob/37a0ff8/test.c#L403) in C
+* [from Node library](http://github.com/joyent/node/blob/842eaf4/src/http.js#L284) in Javascript
Added: trunk/third-party-sw/http_parser/http_parser.c
===================================================================
--- trunk/third-party-sw/http_parser/http_parser.c (rev 0)
+++ trunk/third-party-sw/http_parser/http_parser.c 2012-09-21 09:47:29 UTC (rev 1479)
@@ -0,0 +1,2182 @@
+/* Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev
+ *
+ * Additional changes are licensed under the same terms as NGINX and
+ * copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#include "http_parser.h"
+#include <assert.h>
+#include <stddef.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#ifndef ULLONG_MAX
+# define ULLONG_MAX ((uint64_t) -1) /* 2^64-1 */
+#endif
+
+#ifndef MIN
+# define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef ARRAY_SIZE
+# define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#endif
+
+#ifndef BIT_AT
+# define BIT_AT(a, i) \
+ (!!((unsigned int) (a)[(unsigned int) (i) >> 3] & \
+ (1 << ((unsigned int) (i) & 7))))
+#endif
+
+#ifndef ELEM_AT
+# define ELEM_AT(a, i, v) ((unsigned int) (i) < ARRAY_SIZE(a) ? (a)[(i)] : (v))
+#endif
+
+#if HTTP_PARSER_DEBUG
+#define SET_ERRNO(e) \
+do { \
+ parser->http_errno = (e); \
+ parser->error_lineno = __LINE__; \
+} while (0)
+#else
+#define SET_ERRNO(e) \
+do { \
+ parser->http_errno = (e); \
+} while(0)
+#endif
+
+
+/* Run the notify callback FOR, returning ER if it fails */
+#define CALLBACK_NOTIFY_(FOR, ER) \
+do { \
+ assert(HTTP_PARSER_ERRNO(parser) == HPE_OK); \
+ \
+ if (settings->on_##FOR) { \
+ if (0 != settings->on_##FOR(parser)) { \
+ SET_ERRNO(HPE_CB_##FOR); \
+ } \
+ \
+ /* We either errored above or got paused; get out */ \
+ if (HTTP_PARSER_ERRNO(parser) != HPE_OK) { \
+ return (ER); \
+ } \
+ } \
+} while (0)
+
+/* Run the notify callback FOR and consume the current byte */
+#define CALLBACK_NOTIFY(FOR) CALLBACK_NOTIFY_(FOR, p - data + 1)
+
+/* Run the notify callback FOR and don't consume the current byte */
+#define CALLBACK_NOTIFY_NOADVANCE(FOR) CALLBACK_NOTIFY_(FOR, p - data)
+
+/* Run data callback FOR with LEN bytes, returning ER if it fails */
+#define CALLBACK_DATA_(FOR, LEN, ER) \
+do { \
+ assert(HTTP_PARSER_ERRNO(parser) == HPE_OK); \
+ \
+ if (FOR##_mark) { \
+ if (settings->on_##FOR) { \
+ if (0 != settings->on_##FOR(parser, FOR##_mark, (LEN))) { \
+ SET_ERRNO(HPE_CB_##FOR); \
+ } \
+ \
+ /* We either errored above or got paused; get out */ \
+ if (HTTP_PARSER_ERRNO(parser) != HPE_OK) { \
+ return (ER); \
+ } \
+ } \
+ FOR##_mark = NULL; \
+ } \
+} while (0)
+
+/* Run the data callback FOR and consume the current byte */
+#define CALLBACK_DATA(FOR) \
+ CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1)
+
+/* Run the data callback FOR and don't consume the current byte */
+#define CALLBACK_DATA_NOADVANCE(FOR) \
+ CALLBACK_DATA_(FOR, p - FOR##_mark, p - data)
+
+/* Set the mark FOR; non-destructive if mark is already set */
+#define MARK(FOR) \
+do { \
+ if (!FOR##_mark) { \
+ FOR##_mark = p; \
+ } \
+} while (0)
+
+
+#define PROXY_CONNECTION "proxy-connection"
+#define CONNECTION "connection"
+#define CONTENT_LENGTH "content-length"
+#define TRANSFER_ENCODING "transfer-encoding"
+#define UPGRADE "upgrade"
+#define CHUNKED "chun...
[truncated message content] |
