Commit Graph

214 Commits

Author SHA1 Message Date
Harald Welte 20c6ba5a9e Use OSMO_FD_* instead of deprecated BSC_FD_*
Change-Id: I7d57919877520710b5dc1f54de1de89cae78093e
2020-10-18 22:39:39 +02:00
Oliver Smith f93e3dc1f8 Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in
Change-Id: I2cf6d26b71af23d85b3b9675f9e60c08397115c9
2020-05-22 13:42:48 +02:00
Oliver Smith fd387ecec3 contrib: integrate RPM spec
Remove OpenSUSE bug report link, set version to @VERSION@, make it build
with CentOS 8 etc.

Related: OS#4550
Change-Id: I7ac5f2c6bf11d88a3ebbc2f17d963d26f0b7de13
2020-05-19 15:37:24 +02:00
Oliver Smith 9d5fadcc79 contrib: import RPM spec
Copy the RPM spec file from:
https://build.opensuse.org/project/show/home:mnhauke:osmocom:nightly

Related: OS#4550
Change-Id: I5593db28b91a67a7f51abe086b83905066a1dfe7
2020-05-14 11:49:52 +02:00
Pau Espin d8368cebf8 Bump version: 0.1.1.4-7aa6 → 0.1.2
Change-Id: Ia47cff102c66902d17d92ecfe34018ebd86c5f55
2020-01-02 20:19:28 +01:00
Oliver Smith 7aa63021b6 osmoappdesc.py: switch to python 3
Make build and external tests work with python3, so we can drop
the python2 dependency.

Note that the external tests, which are using this file, are currently
not enabled in jenkins (OS#4317). However, I've manually verified that the
external tests work with this change.

Related: OS#2819
Depends: osmo-python-tests I3ffc3519bf6c22536a49dad7a966188ddad351a7
Change-Id: I19a996458745026cff60608710944e5ab76d8976
2019-12-11 09:38:21 +01:00
Oliver Smith 47ea18eb8e Cosmetic: README.md: document how to run tests
Mention the setcap command, that makes external tests work.

Related: OS#4317
Change-Id: Idc18925f0b71164b52248ca9312b997681d15241
2019-12-10 15:39:50 +01:00
Oliver Smith fdd62daa66 osmoappdesc.py: fix paths to configs
This makes external tests work again.

Related: OS#4317
Change-Id: I73ab32ea48ddfc1b017c8152ec4e95a9ed4f1d7b
2019-12-10 15:39:36 +01:00
Oliver Smith 380305ee09 Cosmetic: README.md: fix typo
Change-Id: I2df3235bade659d62cf179c680a958baabacaa51
2019-12-10 15:30:29 +01:00
Pau Espin 5e10f1db12 Bump version: 0.1.0.2-ce06 → 0.1.1
Change-Id: If517941429cc80419a80771f89f93a7a7ed2bc02
2019-08-07 13:12:48 +02:00
Pau Espin ce0660cfe1 Require libosmocore 0.11.0
Building against older versions fail for different reasons, newest one
being due to osmo_init_logging2 being added in 0.11.0.

Change-Id: Ic7f147c5a26b45b75931cfd8f662642f59a1d725
2019-08-07 13:11:03 +02:00
Pau Espin 210ed934bb Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its
parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However,
definition in C file doesn't contain "(void)", which means number of
parameters is undefined and thus compiler doesn't complain. Let's remove
parameters from all callers before enforcing "(void)" on it.
API osmo_stats_vty_add_cmds never had a param list but has seem problem
(no "void"), so some users decided to pass a parameter to it.

Change-Id: I2e1ab7005514f1a06cac03e967aa5c8ea472e671
Related: OS#4138
2019-08-05 16:28:11 +02:00
Pau Espin 901543a788 Bump version: 0.0.11 → 0.1.0
Change-Id: I4f0d75163fcb7d8d9b5540f8970382ce873680d4
2019-07-16 19:01:16 +02:00
Pau Espin 300cb49540 debian/changelog: Mark 0.0.11 as released
Change-Id: I08a722be405f667797d180ec66e08ba0dc9f59d8
2019-07-16 04:07:09 +00:00
Oliver Smith d567571180 contrib/jenkins.sh: run "make maintainer-clean"
Related: OS#3047
Change-Id: Ieae88eec72801e143daa631e7d01a5e11e9befae
2019-07-10 12:30:53 +02:00
Oliver Smith e524725f9b gitignore: fix application names
Change-Id: I4ea6b6691a0e6cfb3de0c9d2b1a0c3ed68a18514
2019-07-04 15:35:05 +02:00
Pau Espin d68773c4dc tests/Makefile.am: Fix "./configure && make clean && make"
Without this patch, make check fails with following error:
No rule to make target 'atconfig', needed by 'check-local'

Changes needed to fix the issue were gathered by looking at differences
with libosmo-netif's Makefile.

Change-Id: Ie6698d1c1d36e2b8a5391bc2322c1632458751db
2019-07-04 12:21:33 +02:00
Harald Welte 407f7f9307 Fix compiler warning about deprecated _BSD_SOURCE
On (at least) Debian unstable I'm seeing the following compiler
warninig:

/usr/include/features.h:184:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
 # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"

Apparently this was deprecated in glibc 2.20 released in 2014 (!)

Change-Id: I826189dec4107e7c3e8cf4c013316ef3014b7857
2019-01-26 17:39:19 +01:00
Harald Welte 066fc59ed0 change binary builds URL to network:osmocom as that's more maintained
Holgers' personal feed hasn't been updated for quite some time, and
we're building osmo-pcap as part of the normal latest and nightly builds
for quite some time now.

The only disadvantage compared to Holgers' personal feed is the lack of
support for RPM-based distributions (RHEL, CentOS, OpenSuSE).

Change-Id: Ic479c192ca259f01d422da3bd44443fe4160ccaa
2019-01-26 17:34:48 +01:00
Oliver Smith 5edc9b2382 contrib: fix makedistcheck with disabled systemd
EXTRA_DIST files need to be distributed, no matter if the systemd option
is configured or not.

Change-Id: I2fed90915f57bbb054a26bacecf8417d6f3ba5ce
2018-12-06 13:54:54 +01:00
Oliver Smith 14512ddae8 Fix DISTCHECK_CONFIGURE_FLAGS override
Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of
DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the
automake manual, as otherwise the flag can't be changed by the user
anymore.

Related: OS#3718
Change-Id: Iaac6d41ef1cc2d5449edf870f635b28b045dc7db
2018-12-04 15:44:40 +01:00
Pau Espin 3ad56f0408 debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg
Change-Id: Ia4b031fdf54cde3d00818df82e89733420a735ba
2018-11-01 12:52:30 +01:00
Pau Espin a3a6ceb5f7 gitignore: Add compile
Change-Id: Ie801d6929068d11fafd24a1370e60e984b0137c2
2018-11-01 12:52:30 +01:00
Pau Espin 45283d84e3 Install cfg files with autotools
Cfg files are moved to doc/examples like in other osmocom projects.
All the cfg files get installed into
$prefix/share/doc/osmo-pcap/examples/$subdir/, and 1 script per binary is
installed into /etc/osmocom.

Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66
2018-11-01 12:52:22 +01:00
Pau Espin b29f84ff6c Install systemd services with autotools
Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5
2018-11-01 12:51:39 +01:00
Pau Espin b96c957a22 debian: Clean up to look like other osmocom projects
Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0
2018-11-01 12:51:35 +01:00
Pau Espin 80d2b7b8dd contrib/jenkins.sh: Update to current osmocom infra
Otherwise builds end failing in osmocom jenkins/gerrit.

Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
2018-11-01 12:42:54 +01:00
Pau Espin a82aaef507 server: Add pcap snaplen VTY cmd
Change-Id: I8fdcdc1a58926ec66a1dc5dc7a5e57ed4dceb4b4
2018-10-08 20:20:43 +02:00
Pau Espin 868a501213 server: Improve verification of messages from client
Take the chance to define SERVER_MAX_DATA_SIZE as pcap payload, which we
can later match to configurable snaplen parameter.

Change-Id: I45d4c59026faf1108c0976eb6ad8c270e3577dbf
2018-10-08 20:20:43 +02:00
Pau Espin b799344ecd client_send_link: snaplen not needed during allocation
We don't send any pkt data, so no need to allocate snaplen bytes extra.

Change-Id: I8d6385f6ff265564492121812a7a9f2bcfea3d5f
2018-10-08 20:20:43 +02:00
Pau Espin f946fa21ee client: Add pcap snaplen VTY cmd
Change-Id: I84fda9f27b725e031c218187ab679392dfa7ec3d
2018-10-08 20:20:43 +02:00
Pau Espin 168949e119 client: Set snaplen to MAXIMUM_SNAPLEN
Despite this value not being exported publicly, the truth is that
tcpdump and wireshark nowadays avoid processing any file with snaplen
bigger than this value:
"tcpdump: pcap_loop: invalid packet capture length 861244, bigger than
snaplen of 262144"
It also fails to set snaplen to values bigger than that:
"tcpdump -s 262145" --> "tcpdump: invalid snaplen 262145"

pcapfix also warns about wrong packet length if bigger than same value
(defined as PCAP_MAX_SNAPLEN there).

MAXIMUM_SPANPLEN is defined in tcpdump's netdissect.h and libpcap's
pcap-int.h. It is also defined as WTAP_MAX_PACKET_SIZE in
wireshark/wiretap/wtap.h (this one being the only publicly available).

Change-Id: Ib7449d5aba9da342c150704ebd0e1f09e7f7276c
2018-10-08 20:20:43 +02:00
Pau Espin db7be44632 Use enum for PKT_LINK_*
Makes it easier to understand different types and how they relate to
same field.

Change-Id: I1bec4d5d132a1476f9c418502ad808b7c778cee2
2018-10-08 20:20:43 +02:00
Pau Espin f10c57801a Replace '.' in counter names with ':'
The '.' is illegal character in counter names, as they are exported
via CTRL interface, where '.' has a special meaning that cannot be
used by strings comprising the variable name.

Change-Id: Icec5338d3242137980fa05d2c7ae2db940afb542
2018-10-08 20:20:43 +02:00
Pau Espin 78262bda57 jenkins.sh: enable werror and sanitize configure flags
Change-Id: Id8ad324ae9e1c57e1328bd1be04977e921125847
2018-10-08 13:41:47 +02:00
Pau Espin e241eada55 configure.ac: Add --enable-sanitize flag
Change-Id: I6a3bc49142b93a35988c8763f3125d7b5ffddaef
2018-10-08 13:39:51 +02:00
Pau Espin f59fabf9dc configure.ac: Add --enable-werror flag
Change-Id: I387a3365fb5b7340bf67fb945df434442924a4c7
2018-10-08 13:38:42 +02:00
Pau Espin d475673b69 osmo_client_send_data: Fix wrong log format
According to pcap.h, type bpf_u_int32 can be 32 bits on some systems,
so better cast explicitly to size_t to make sure always correct size is
used by log function.

Fixes warning:
osmo-pcap/src/osmo_client_network.c:175:4: warning: format ‘%zu’ expects argument of type ‘size_t’, but argument 7 has type ‘bpf_u_int32’ {aka ‘unsigned int’} [-Wformat=]
    "Capture len too big %zu\n", in_hdr->caplen);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~

Change-Id: I98654da143218d3e57da4e57781252eb3d3f3d5b
2018-10-08 13:33:50 +02:00
Pau Espin dc27ca85aa Drop osmo_init_logging and use osmo_init_logging2
Change-Id: Ib1c38f6134b3c1988477caa0f2c281b1ef01d5e0
2018-10-08 13:29:52 +02:00
Pau Espin 5f3c30c40c server: Properly name main talloc ctx
Change-Id: I810417d84c6a6ebcbc4b75a9bc41607bb0637228
2018-10-08 13:29:52 +02:00
Pau Espin 2828690633 client: Properly name main talloc ctx
Change-Id: Ibaa7f0e0add5f5e61cc0bb82341ee3b6b5c0cf07
2018-10-08 13:29:52 +02:00
Pau Espin 6e9bf9aa15 vty: skip installing cmds now always installed by default
Fixes following compilation warning:
osmo-pcap/src/osmo_client_vty.c:511:2: warning: ‘install_default’ is deprecated: Now happens implicitly with install_node() [-Wdeprecated-declarations]

Depends: libosmocore I5021c64a787b63314e0f2f1cba0b8fc7bff4f09b
Change-Id: I943f68dbafd7906313ad9e59f4adb289ae23cdec
2018-10-08 13:29:52 +02:00
Pau Espin 3dfdbc21dc cosmetic: client: rename forward_packet function
Function only checks if packet should be forwarded, it doesn't forward
any packet.

Change-Id: I87cd64290245db134b17bc0d6665c58f1cde17b6
2018-10-08 13:08:52 +02:00
Harald Welte e89231d8b0 debian/control: Fix URLs for homepage, git, gitweb
Change-Id: Iff74cf6b3e53a6786a96738b609a2e2d685b1300
2018-02-09 12:07:50 +01:00
Harald Welte f335e37ed5 Add support for generating IPIP to osmo-pcap-client
This allows the user to change the configuration between either using

a) the classic OsmoPCAP protocol (over TCP with or without TLS)
   which is used when you want to talk to an osmo-pcap-server

b) the (new) IPIP encapsulation, which will simply take the IP
   packet (without Ethernet or pcap header) and transmit it inside IPIP
   to the specified server IP address.  This is useful for gettin
   real-time streaming into wireshark.

Change-Id: I8056fc163ac2f15adcb964d867dd5e51df4e4710
2018-02-09 12:07:50 +01:00
Max 53044df9d5 Use release helper from libosmocore
See
https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release
for details.

Change-Id: Iafe5905895a656b7055d58ca8f745fcfa4bd9886
Related: OS#1861
2017-08-28 10:57:19 +00:00
Max 93ac357b48 Add gitreview config
Change-Id: I35b3aaa3f8af4127d8a1b00c77ab02ae6a182714
2017-08-22 12:34:59 +02:00
Harald Welte 5f071cd2c6 client: Move to osmo_sock_init2_ofd()
We can simplify the code even further by using the osmo_fd version
of osmo_sock_init2() called osmo_sock_init2_ofd(), which takes care
of filling the osmo_fd.fd member and registering the socket in the
select loop.

Change-Id: Ibf1480e7dee287db77a19bb9f0254edddf7706ab
2017-07-21 18:25:15 +02:00
Harald Welte f266924bac Use libosmocore osmo_sock_init2() instead of local implementation
A related function for "create a socket, bind it locally and connect
remotely" has meanwhile been introduced in libosmocore, so the local
implementation can go.

Change-Id: Ieda77ad8b3f7b89faa09882c0037562ce4d0fc89
2017-07-21 18:20:36 +02:00
Harald Welte 2fe9cb937d Rename osmo_pcap_{client_server} executables to osmo-pcap-{client,server}
This naming is more in line with what all the other osmocom programs are
doing (e.g. osmo-pcu, osmo-bts-sysmo, osmo-bsc, ...).  We don't
generally use osmo_ anywhere else, so I suggest to change it for more
uniformity.

Change-Id: If1e3ce76f93266e0f01c801204769432b571fdb1
2017-07-21 15:21:01 +02:00