Commit Graph

214 Commits

Author SHA1 Message Date
Harald Welte 2aea8704f3 Use TCP port numbers for VTY that don't overlap with other Osmocom Software
osmo-pcap for historical reasons uses the same port numbers as
OsmoPCU and OsmoBTS.  This leads to problems when wanting to run related
software together on one system.  Let's break the historical assumptions
and start with non-overlapping port numbers that are allocated/assigned
from https://osmocom.org/projects/cellular-infrastructure/wiki/Port_Numbers

Change-Id: I638ac0534517931d0987ce9f72f5db4f5b6c16b7
2017-07-21 15:18:02 +02:00
Harald Welte 604e071159 sock_src_init(): Don't freeaddrinfo() undefined src_result
src_result is only valid "if (src)", so we cannot unconditionally
free it:

(gdb) bt
    host=0x52 <error: Cannot access memory at address 0x52>, src=0x0)
    at /usr/src/debug/osmo-pcap/0.0.6+gitrAUTOINC+4776b2972e-r1d/git/src/osmo_client_network.c:165

Change-Id: I3b6778d9110583ecb1daec59ef2c86465d5818b9
2017-07-21 13:11:24 +02:00
Holger Hans Peter Freyther 4776b2972e debian: Add -dbg packages for the osmo-pcap-client and osmo-pcap-server
Currently looking at a weird issue. Make it possible to install the
-dbg packages.

Change-Id: I7d6c8e491be459151c1531b86f28bb1dc2ee8bb4
2017-03-07 23:17:41 +01:00
Holger Hans Peter Freyther 17f5b00506 debian: Make a new release with the new feature
Change-Id: Ibe86b761b494e0fb78bbbc78e3c1982e44185750
2017-01-17 09:13:36 +01:00
Holger Hans Peter Freyther 40c1e85499 client: Allow to bind to a specific source_ip
Modify the osmo_sock_init (code clone to be integrated upstream)
to allow binding to a specific source ip and source port. Allow
the source ip to be configured but allow the kernel to pick a
random port for us.

This is necessary for systems with multiple interfaces where the
default route is not necessarily the right one to connect to the
pcap server.

Change-Id: I84e728b0752213d28f970fcbbfd6565c441ccfeb
2017-01-17 09:06:42 +01:00
Holger Hans Peter Freyther fdebd88059 debian: Make a new release with the new features we gained
Change-Id: I85e210e6ed14aef085902a5af6407d51685aecba
2016-11-09 02:11:45 +01:00
Holger Hans Peter Freyther 36a183fd78 client: Tolerate an invalid pcap_handle
When not running as root the opening might fail and then we would
crash when sending the link information. Do not crash. This could
have crashed before the re-factoring but due the async connect it
seems more likely we hit it now.

Change-Id: I26a10c401a9a8998acc50a4bd4432d2ac7fceaeb
2016-11-09 01:46:35 +01:00
Holger Hans Peter Freyther 9294c40f14 client: disconnect before connecting the connection
With the VTY a user can write connect, connect, connect and this
would lead to leaking fds. Always close the connection.

Change-Id: Iab94dc2fd28496bf5fd8ceb5611f9e6505ccae1b
2016-11-09 01:04:04 +01:00
Holger Hans Peter Freyther 0a94e57b72 client: Allow to stop and remove a connection
Change-Id: I2118723345caf6a68f03de74a4182506e7bf105c
2016-11-09 01:04:04 +01:00
Holger Hans Peter Freyther d7ab53dc16 client: Do not connect default connection if no ip/port present
Ignore the default connection if no srv_port and has been specified.

Change-Id: I6a3a9a0af73a9183a6b233937af3357d15a07f25
2016-11-09 01:04:04 +01:00
Holger Hans Peter Freyther 1448f50db4 client: Allow to configure and connect multiple servers
Allow to configure multiple servers and connect. Introduce a new VTY
node to allow multiple servers. Add an explicit connect. Do not put
the main connection into the same list but assume it exists.

Change-Id: I9448ad4a005dd7c7eb1c615d03e57d6cb058ae4d
2016-11-09 01:04:04 +01:00
Holger Hans Peter Freyther 956c3facf1 client: Enable a non-blocking connect to the PCAP server
If we want to have multiple servers we should not block when trying to
connect to one of them. Enable non blocking mode and handle the fd
specially until it is connected. E.g. on failed connect the read will
become readable but fail, otherwise it becomes writable.

Clear the write queue to make sure that the link data is sent first.
We might be able to introduce a osmo_wqueue_prepend.

Change-Id: Iae2bc264d15aa8598beefc194e3b8c4ebe87320a
2016-11-09 01:03:59 +01:00
Holger Hans Peter Freyther e3d7c3e154 client: Prepare to work with a list of servers
There is no VTY code yet and no servers in the list but it looks
good client this.

Change-Id: Ic35748f1a95a880a9fa49dd18361592d8ac941ba
2016-11-09 00:20:29 +01:00
Holger Hans Peter Freyther bdda28b1f5 client: Finish renaming client to conn in other places of the code
Change-Id: I3c7c499c921b03752cbbcdda3eac8ca360323a22
2016-11-09 00:20:29 +01:00
Holger Hans Peter Freyther 13f397c68c client: Prepare to have multiple server connections
Take out various fields into a new connection class. We will have the
option to connect to multiple servers.

Change-Id: I820176d133fbdb0240a16eb4e1a6d505e5c080c6
2016-11-09 00:20:29 +01:00
Holger Hans Peter Freyther 0381276993 Merge branch 'feature/tls'
Add TLS support to the client and server. What is known working is
support of anonymous mode with generated DH params. Mildly tested
by hand over localhost.
2016-09-08 16:32:36 +02:00
Holger Hans Peter Freyther 22acd211f1 test: Add tls config file and enable tls a bit
Change-Id: Iba0008e3e0da276cc65c7501145b65294233febb
2016-09-08 16:24:04 +02:00
Holger Hans Peter Freyther 07b94157ec doc: Add initial documentation for the tls support
Change-Id: Ifc042e6755c223339fafbc3af9106073341f9b45
2016-09-08 16:17:02 +02:00
Holger Hans Peter Freyther cf29fd7069 server: Add vty interface for the TLS configuration
Make the priority configurable, load DH params, allow to specify
certificates or anonymous operations.

Change-Id: I8ec3c0f8e1ee2089e1b7dacd9de842260930032f
2016-09-08 16:17:02 +02:00
Holger Hans Peter Freyther ff3314e45c server: Allow to enable tls for the pcap server
Add simple vty command to enable tls per client or not. We still
need a lot more tls commands for the server.

Change-Id: I583b7d5c999ed01c135882895fb2a8f04739ad00
2016-09-08 16:17:01 +02:00
Holger Hans Peter Freyther 9ea4da4bbb server: Introduce tls mode for the server
Using tls priority of NORMAL:+ANON-ECDH:+ANON-DH already allows a
client to connect to a server and protect the data using tls.

Generate the dh params on load (and do that for the client right
now as well) but that will go away soon.

Change-Id: Ifa2ad24c0a631573c259a3bf94b91a946ad9ec9d
2016-09-08 16:17:01 +02:00
Holger Hans Peter Freyther 064d224288 server: Re-factor the read dispatch and connection close
In preparation of TLS let's not call close_connection from
within the dispatch but return an error and then close the
connection from the outside.

Change-Id: I607fed0191907cfbc8887d749c88f7f4ffb87166
2016-09-08 16:17:00 +02:00
Holger Hans Peter Freyther 1bec9d5d09 server: Add API function to close a connection
Change-Id: I4295854c749d86ca8c34a979c877363d9f48e176
2016-09-08 16:17:00 +02:00
Holger Hans Peter Freyther 098850d0a8 server: Move to a write_queue for the conn socket
We are only reading from the socket and never write but the osmo_tls
code is integrated with it. We will never write and the queue size is
set to 0. Simplify the read_cb.

Change-Id: I32335b1f7b7ed06b92c6222516c185301ce13781
2016-09-08 16:17:00 +02:00
Holger Hans Peter Freyther 6413e7669e server: Update copyright after zmq changes
Change-Id: I8861acaaec5465de620637b7fdf3341517133c4f
2016-09-08 16:16:59 +02:00
Holger Hans Peter Freyther c266796caa client: Initial support for TLS in the client
Use GNUtls because it is GPL compatible and instead of mbedTLS seems
to have a working non-blocking I/O integration. GNUtls has various
issues that could not be resolved easily:

* Pick spdy as sub protocol
* gmt_time not randomized
* private key loaded to RAM (but not verified)

This is the beginning and not the end. Client support might need more
work with actual tls verification. Maybe more manual x509 cert
verification is needed and maybe client certs don't work at all. I try
to ignore renegotiation as I threw away the key.

Reload x509 creds and keys as they might have changed from one
connection to another.

Change-Id: I9128e14084da1fc2705f858393f98b8133996172
2016-09-08 16:16:55 +02:00
Holger Hans Peter Freyther c1c194393b client: Add API function to close and re-connect network connection
Change-Id: Ib4e17948ffa84e73c1c81734e6002a73251d744b
2016-09-08 15:48:02 +02:00
Holger Hans Peter Freyther 3d439d0d08 tls: Add initial ideas about TLS in the client/server
Change-Id: I63a8cea776e57dce747a357c40f9caa0a9e2d3b5
2016-09-08 15:48:02 +02:00
Holger Hans Peter Freyther 0b4b824887 tests: Enable the vty tests for the osmo-pcap as well
Change-Id: I1704e0d58a04770a3aac1f70f3e01ee9ac585dbf
2016-09-08 15:21:29 +02:00
Holger Hans Peter Freyther fa5572e2af client: Use pcap_stats and export them as statistics
Attempt to write code that detects the wrap and is doing the
right thing when it happens.

Change-Id: I501ebc49d3e86b0605ec1fbe2f62aee3f362aa36
2016-08-19 20:28:21 +02:00
Holger Hans Peter Freyther 99526a6ad0 server: Add global and per client counters and begin to count
Add the basics for getting a picture what a client and the server
is doing. We need to create unique descriptions as the code is
working with names and not numbers for clients.

Change-Id: I4a9be5bdd815d280cccf0199efc2ca79fc77d393
2016-08-19 19:23:00 +02:00
Holger Hans Peter Freyther c3455dcb79 client: Additional counters for the statistics
Add more counters and start counting them when reading from the
PCAP library and when trying to write to the socket.

Change-Id: I52d3064a265b402ac849d8578a14f718156c0805
2016-08-19 17:31:01 +02:00
Holger Hans Peter Freyther f416463a3c client: First round of statistics in the pcap client
Count certain events that can help to understand what is going on.
This includes OOM, failure to queues.

Change-Id: I4a2dad32afb577822c7181d2813ea5a7e693c704
2016-08-18 18:39:53 +02:00
Holger Hans Peter Freyther 918be51338 server: Fail if the telnet interface can not be bound
Change-Id: Ibd14da3e7f62065f5d28d4a90d2b55eed609b64f
2016-08-18 18:37:13 +02:00
Holger Hans Peter Freyther 86282d65db client: Fail to start if it can't bind the telnet interface
Change-Id: Ic628dd348f8fce978691aaa331b0e67ee13f10c6
2016-08-18 18:34:27 +02:00
Holger Hans Peter Freyther 6e938eda1c stats: Initialize the stats(d) backend in the client/server
Initialize the stats backend allowing key performance indicators
to be pushed out of the system.

Change-Id: Id652b60d230f705b927e49d81cd3731432156c7e
2016-08-13 10:36:58 +02:00
Holger Hans Peter Freyther f8ff41e0f9 misc: Address compiler warning about deprecated header
In file included from osmo_client_main.c:27:0:
/home/ich/install/openbsc/include/osmocom/core/process.h:1:2: warning: #warning "Update from osmocom/core/process.h to osmocom/core/application.h" [-Wcpp]
 #warning "Update from osmocom/core/process.h to osmocom/core/application.h"

Change-Id: Id60cf90ebb7255d79f8e3bdb81f099f1362d538b
2016-08-13 10:31:02 +02:00
Holger Hans Peter Freyther df92652c95 vty: Fix compiler warning about type changes
osmo_client_main.c:57:2: warning: initialization from incompatible pointer type
  .go_parent_cb = osmopcap_go_parent,
  ^
osmo_client_main.c:57:2: warning: (near initialization for ‘vty_info.go_parent_cb’)
  CCLD     osmo_pcap_client
  CC       osmo_server_main.o
osmo_server_main.c:56:2: warning: initialization from incompatible pointer type
  .go_parent_cb = osmopcap_go_parent,
  ^
osmo_server_main.c:56:2: warning: (near initialization for ‘vty_info.go_parent_cb’)

Change-Id: If73c85a64789ef4bff63dcfe008e918e650b428f
2016-08-13 10:29:46 +02:00
Holger Hans Peter Freyther bdcbe0a679 misc: Update the todo with an obvious thing to do
Change-Id: I002e72776c6916ee331b4387b6d645d0c48c388c
2016-08-12 11:01:59 +02:00
Holger Hans Peter Freyther 2c503dd852 todo: With zeromq we can stream the data anywhere we want
Change-Id: I97c23cbf2d5f42b12e2fc8426633401c4edc1a62
2016-08-06 12:26:15 +02:00
Holger Hans Peter Freyther e024869a72 server: Add zmq based event and data interface to the server
To allow easily extracting or streaming the data to an external
analysis system, zeromq can be configured (and reconfigured). The
system works as fire and forget and no loss detection is present.

A simple go based client application is provided to subscribe to
the publisher.

Change-Id: I4f3e6d675023a81b7d2ee19bf1f44a2be0ca003c
2016-08-05 16:10:05 +02:00
Holger Hans Peter Freyther ad29ce6f06 server: Add zmq interface for publishing events
Change-Id: I383558bb9aad3cb149f35e13910a1d6aa79afc84
2016-08-04 18:02:57 +02:00
Holger Hans Peter Freyther 2899428be2 server: Add a config knob to not store the pcap stream
We might only want to centralize the data streams but handle the
data differently. This will be combined with an upcoming ZeroMQ
publisher feature to broadcast all events out.

Change-Id: I12c6bf16310820d882fa28c6930931650475e0bb
2016-08-04 16:14:38 +02:00
Holger Hans Peter Freyther 9646754e1f ci: Add travis.yml for the github account
Change-Id: I26de644a9cf4c6d6fb366c8a8fd701570005b9a8
2016-08-03 22:00:58 +02:00
Holger Hans Peter Freyther 26ba7b247e todo: Add another of my wishlist items
Change-Id: I5a6c473a97d04aecae8101a024edb734bbe24401
Reviewed-on: https://gerrit.osmocom.org/27
Tested-by: Jenkins Builder
Reviewed-by: Harald Welte <laforge@gnumonks.org>
2016-05-12 11:22:39 +00:00
Holger Hans Peter Freyther c2715e917f todo: Update with my long term goal to have TLS support
Change-Id: I566d48fe9831f384b93c3fad72a7dae9dd61b2d2
2016-05-08 11:24:04 +02:00
Holger Hans Peter Freyther ea4ad4680a jenkins: Attempt to fix FreeBSD distcheck
Change-Id: I758a5590f3d964039363852f07f0967170fd9a28
2016-05-03 14:37:34 +02:00
Holger Hans Peter Freyther ddc698fa92 freebsd: Another fix for the next file
Change-Id: I509e44c48d7983b305bc5fbcd9360ead74ef8d68
2016-05-03 14:37:31 +02:00
Holger Hans Peter Freyther 072b183cd8 freebsd: Include netinet/in.h and hopefully fix the build
Fixes:
/usr/include/netinet/ip.h:69:17: error: field has incomplete type 'struct in_addr'
        struct  in_addr ip_src,ip_dst;  /* source and dest address */

Change-Id: I446f67b85122363de66c86ddb25c8392ffa61a4f
2016-05-03 14:37:28 +02:00
Holger Hans Peter Freyther 7ab0c0b86c jenkins: Attempt to fix build on FreeBSD and not break Linux
pcap-config is not present as libpcap is part of the base system.
Use it as /bin/true and inject -lpcap as PCAP_LIBS.

Change-Id: I0c2b5222da0ee037d3a3156ac1fef89dfd849cad
2016-05-03 14:37:26 +02:00