summaryrefslogtreecommitdiffstats
path: root/openbsc/src
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2009-07-29 10:58:08 +0200
committerHarald Welte <laforge@gnumonks.org>2009-07-29 10:58:08 +0200
commit849427d89513bbadca594035e03d73e2bcf2ac09 (patch)
tree3b06dc9f59a0669cd1e632820b4c65a593ceaf6e /openbsc/src
parent198f3f559d62bc4bb569d2589a82faffef006619 (diff)
parent89acf061c257912e6a8487a4f000dfb22d162c9c (diff)
Merge commit 'origin/master'
Diffstat (limited to 'openbsc/src')
-rw-r--r--openbsc/src/rtp_proxy.c2
-rw-r--r--openbsc/src/vty/command.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/openbsc/src/rtp_proxy.c b/openbsc/src/rtp_proxy.c
index 158145b75..a581b9fdf 100644
--- a/openbsc/src/rtp_proxy.c
+++ b/openbsc/src/rtp_proxy.c
@@ -57,7 +57,7 @@ struct rtcp_hdr {
#define RTCP_IE_CNAME 1
-/* iterate over all chunks in one RTCP message, kook for CNAME IEs and
+/* iterate over all chunks in one RTCP message, look for CNAME IEs and
* replace all of those with 'new_cname' */
static int rtcp_sdes_cname_mangle(struct msgb *msg, struct rtcp_hdr *rh,
u_int16_t *rtcp_len, const char *new_cname)
diff --git a/openbsc/src/vty/command.c b/openbsc/src/vty/command.c
index 94a5c2af2..e9b3652fa 100644
--- a/openbsc/src/vty/command.c
+++ b/openbsc/src/vty/command.c
@@ -45,6 +45,7 @@ Boston, MA 02111-1307, USA. */
//#include "workqueue.h"
#include <openbsc/gsm_data.h>
+#include <openbsc/gsm_subscriber.h>
/* Command vector which includes some level of command lists. Normally
each daemon maintains each own cmdvec. */