aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2011-08-05 18:02:47 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2011-08-05 18:02:47 +0200
commitd5cbb675a9f0c5f56d01401870e5eceb3eb3a6d8 (patch)
tree0d35263e379c1743036d6372e5adf24045a180b2 /include
parent0e945484846a7be80aa6ab4711b0374d994ad98c (diff)
pcap-client: Hacks to compile with an old libosmocorezecke/old-libosmocore
We are running a system where we do not want to upgrade libosmocore right now. Compile the osmo-pcap-client with a libosmocore from around January.
Diffstat (limited to 'include')
-rw-r--r--include/osmo-pcap/common.h2
-rw-r--r--include/osmo-pcap/osmo_pcap_client.h12
2 files changed, 7 insertions, 7 deletions
diff --git a/include/osmo-pcap/common.h b/include/osmo-pcap/common.h
index 9275f0a..22a0a08 100644
--- a/include/osmo-pcap/common.h
+++ b/include/osmo-pcap/common.h
@@ -23,7 +23,7 @@
#ifndef OSMO_PCAP_COMMON_H
#define OSMO_PCAP_COMMON_H
-#include <osmocom/core/logging.h>
+#include <osmocore/logging.h>
#include <osmocom/vty/vty.h>
#include <osmocom/vty/buffer.h>
diff --git a/include/osmo-pcap/osmo_pcap_client.h b/include/osmo-pcap/osmo_pcap_client.h
index 7aae7ca..0ba07d9 100644
--- a/include/osmo-pcap/osmo_pcap_client.h
+++ b/include/osmo-pcap/osmo_pcap_client.h
@@ -23,9 +23,9 @@
#include <inttypes.h>
#include <pcap.h>
-#include <osmocom/core/select.h>
-#include <osmocom/core/timer.h>
-#include <osmocom/core/write_queue.h>
+#include <osmocore/select.h>
+#include <osmocore/timer.h>
+#include <osmocore/write_queue.h>
struct osmo_pcap_client {
@@ -36,12 +36,12 @@ struct osmo_pcap_client {
struct bpf_program bpf;
char *filter_string;
int filter_itself;
- struct osmo_fd fd;
+ struct bsc_fd fd;
char *srv_ip;
int srv_port;
- struct osmo_wqueue wqueue;
- struct osmo_timer_list timer;
+ struct write_queue wqueue;
+ struct timer_list timer;
};
extern struct osmo_pcap_client *pcap_client;