osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move the AX.25 address routines to address_to_str.c, where they belong; 

hopefully this will fix some of the build errors.

svn path=/trunk/; revision=44219
This commit is contained in:
Guy Harris 2012-08-02 18:51:40 +00:00
parent aa65950896
commit dfe0389590
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/address_to_str.c
View File

@ -477,6 +477,30 @@ tvb_fcwwn_to_str(tvbuff_t *tvb, const gint offset)
return fcwwn_to_str (tvb_get_ptr(tvb, offset, 8));
}
/* XXX FIXME
remove this one later when every call has been converted to address_to_str()
*/
gchar *
ax25_to_str(const guint8 *ad)
{
return bytestring_to_str(ad, 7, ':');
}
/* XXX FIXME
remove this one later when every call has been converted to address_to_str()
*/
gchar *
get_ax25_name(const guint8 *ad)
{
address addr;
addr.type = AT_AX25;
addr.len = 7;
addr.data = ad;
return address_to_str( &addr );
}
/*XXX FIXME the code below may be called very very frequently in the future.
optimize it for speed and get rid of the slow sprintfs */
/* XXX - perhaps we should have individual address types register

24
epan/to_str.c
View File

@ -1024,30 +1024,6 @@ decode_numeric_bitfield(const guint32 val, const guint32 mask, const int width,
return buf;
}
/* XXX FIXME
remove this one later when every call has been converted to address_to_str()
*/
gchar *
ax25_to_str(const guint8 *ad)
{
return bytestring_to_str(ad, 7, ':');
}
/* XXX FIXME
remove this one later when every call has been converted to address_to_str()
*/
gchar *
get_ax25_name(const guint8 *ad)
{
address addr;
addr.type = AT_AX25;
addr.len = 7;
addr.data = ad;
return address_to_str( &addr );
}
/*
This function is very fast and this function is called a lot.
XXX update the ep_address_to_str stuff to use this function.