paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-02 04:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use hexparse() from libosmocore >= 0.1.14

Browse Source
This commit is contained in:
Harald Welte
2010-07-30 10:39:26 +02:00
parent 417920a660
commit 88f9d98ccc
2 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/configure.in
View File

@@ -22,7 +22,7 @@ AC_SEARCH_LIBS(gtp_new, gtp,
AM_CONDITIONAL(HAVE_LIBGTP, test "x$GPRS_LIBGTP" != "x") AM_CONDITIONAL(HAVE_LIBGTP, test "x$GPRS_LIBGTP" != "x")
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.1.13) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.1.14)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.1.9) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.1.9)
dnl checks for header files dnl checks for header files

28
openbsc/src/vty_interface_layer3.c
View File

@@ -37,6 +37,7 @@
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <osmocore/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <osmocore/utils.h>
#include <openbsc/db.h> #include <openbsc/db.h>
#include <osmocore/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
@@ -47,33 +48,6 @@
extern struct gsm_network *gsmnet_from_vty(struct vty *v); extern struct gsm_network *gsmnet_from_vty(struct vty *v);
static int hexparse(const char *str, u_int8_t *b, int max_len)
{
int i, l, v;
l = strlen(str);
if ((l&1) || ((l>>1) > max_len))
return -1;
memset(b, 0x00, max_len);
for (i=0; i<l; i++) {
char c = str[i];
if (c >= '0' && c <= '9')
v = c - '0';
else if (c >= 'a' && c <= 'f')
v = 10 + (c - 'a');
else if (c >= 'A' && c <= 'F')
v = 10 + (c - 'A');
else
return -1;
b[i>>1] |= v << (i&1 ? 0 : 4);
}
return i>>1;
}
static void subscr_dump_full_vty(struct vty *vty, struct gsm_subscriber *subscr) static void subscr_dump_full_vty(struct vty *vty, struct gsm_subscriber *subscr)
{ {
int rc; int rc;