sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

mbim: Add IPv4/v6 Element & Address extractors 

The IP Configuration data structure does not match any of the existing
data structure serialization conventions in the rest of the MBIM
specification.  So add IPv4 / v6 specific extractors for IPV4 address
and IPV4 Element structures.
This commit is contained in:
Denis Kenzior 2017-11-13 20:43:41 -06:00
parent f8d6a0a668
commit f43341af2f
2 changed files with 105 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
drivers/mbimmodem/mbim-message.c
View File

@ -821,6 +821,94 @@ bool mbim_message_get_arguments(struct mbim_message *message,
return result;
}
static bool _mbim_message_get_data(struct mbim_message *message,
uint32_t offset,
void *dest, size_t len)
{
struct mbim_message_iter iter;
struct mbim_message_header *hdr;
uint32_t type;
size_t begin;
const void *src;
size_t pos;
uint32_t i;
if (unlikely(!message))
return false;
if (unlikely(!message->sealed))
return false;
hdr = (struct mbim_message_header *) message->header;
type = L_LE32_TO_CPU(hdr->type);
begin = _mbim_information_buffer_offset(type);
_iter_init_internal(&iter, CONTAINER_TYPE_STRUCT,
"", NULL,
message->frags, message->n_frags,
message->info_buf_len, begin, offset, 0);
pos = align_len(iter.pos, 4);
if (pos + len > iter.len)
return false;
for (i = 0; i + 4 < len; i += 4) {
src = _iter_get_data(&iter, pos + i);
memcpy(dest + i, src, 4);
}
src = _iter_get_data(&iter, pos + i);
memcpy(dest + i, src, len - i);
return true;
}
bool mbim_message_get_ipv4_address(struct mbim_message *message,
uint32_t offset,
struct in_addr *addr)
{
return _mbim_message_get_data(message, offset, &addr->s_addr, 4);
}
bool mbim_message_get_ipv4_element(struct mbim_message *message,
uint32_t offset,
uint32_t *prefix_len,
struct in_addr *addr)
{
uint8_t buf[8];
if (!_mbim_message_get_data(message, offset, buf, 8))
return false;
*prefix_len = l_get_le32(buf);
memcpy(&addr->s_addr, buf + 4, 4);
return true;
}
bool mbim_message_get_ipv6_address(struct mbim_message *message,
uint32_t offset,
struct in6_addr *addr)
{
return _mbim_message_get_data(message, offset, addr->s6_addr, 16);
}
bool mbim_message_get_ipv6_element(struct mbim_message *message,
uint32_t offset,
uint32_t *prefix_len,
struct in6_addr *addr)
{
uint8_t buf[20];
if (!_mbim_message_get_data(message, offset, buf, 20))
return false;
*prefix_len = l_get_le32(buf);
memcpy(&addr->s6_addr, buf + 4, 16);
return true;
}
struct container {
void *sbuf; /* static buffer */
size_t sbuf_size;

17
drivers/mbimmodem/mbim-message.h
View File

@ -20,6 +20,8 @@
*/
#include <stdint.h>
#include <sys/socket.h>
#include <netinet/in.h>
struct mbim_message;
struct mbim_message_iter;
@ -55,6 +57,21 @@ const uint8_t *mbim_message_get_uuid(struct mbim_message *message);
bool mbim_message_get_arguments(struct mbim_message *message,
const char *signature, ...);
bool mbim_message_get_ipv4_address(struct mbim_message *message,
uint32_t offset,
struct in_addr *addr);
bool mbim_message_get_ipv4_element(struct mbim_message *message,
uint32_t offset,
uint32_t *prefix_len,
struct in_addr *addr);
bool mbim_message_get_ipv6_address(struct mbim_message *essage,
uint32_t offset,
struct in6_addr *addr);
bool mbim_message_get_ipv6_element(struct mbim_message *message,
uint32_t offset,
uint32_t *prefix_len,
struct in6_addr *addr);
bool mbim_message_iter_next_entry(struct mbim_message_iter *iter, ...);
struct mbim_message_builder *mbim_message_builder_new(struct mbim_message *msg);