Rename address_to_str() to ep_address_to_str() because:

1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29747 f5534014-38df-0310-8fa8-9805f1628bb7

37 files changed, 652 insertions, 650 deletions

diff --git a/asn1/ansi-tcap/packet-ansi_tcap-template.c b/asn1/ansi-tcap/packet-ansi_tcap-template.c
index 394382abcc..2884b3efe7 100644
--- a/asn1/ansi-tcap/packet-ansi_tcap-template.c
+++ b/asn1/ansi-tcap/packet-ansi_tcap-template.c
@@ -183,8 +183,8 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){
           buf = ep_alloc(MAX_TID_STR_LEN);
           buf[0] = '\0';
           g_snprintf(buf, MAX_TID_STR_LEN, "%s%s%s",
-                ansi_tcap_private.TransactionID_str, address_to_str(src),
-                address_to_str(dst));
+                ansi_tcap_private.TransactionID_str, ep_address_to_str(src),
+                ep_address_to_str(dst));
 
           /* If the entry allready exists don't owervrite it */
           ansi_tcap_saved_invokedata = g_hash_table_lookup(TransactionId_table,buf);
@@ -221,8 +221,8 @@ find_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U
   buf[0] = '\0';
   /* Reverse order to invoke */
   g_snprintf(buf, MAX_TID_STR_LEN, "%s%s%s",
-        ansi_tcap_private.TransactionID_str, address_to_str(dst),
-        address_to_str(src));
+        ansi_tcap_private.TransactionID_str, ep_address_to_str(dst),
+        ep_address_to_str(src));
 
   ansi_tcap_saved_invokedata = g_hash_table_lookup(TransactionId_table, buf);
   if(ansi_tcap_saved_invokedata){
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index aeb6881757..9f274b7645 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -32,7 +32,7 @@
  * Title                3GPP2                   Other
  *
  *   Cellular Radiotelecommunications Intersystem Operations
- *                      3GPP2 N.S0005-0 v 1.0           ANSI/TIA/EIA-41-D 
+ *                      3GPP2 N.S0005-0 v 1.0           ANSI/TIA/EIA-41-D
  *
  *   Network Support for MDN-Based Message Centers
  *                      3GPP2 N.S0024-0 v1.0    IS-841
@@ -62,8 +62,8 @@
  *   WIN Phase 1
  *                      3GPP2 N.S0013-0 v1.0    IS-771
  *
- *       DCCH (Clarification of Audit Order with Forced 
- *         Re-Registration in pre-TIA/EIA-136-A Implementation 
+ *       DCCH (Clarification of Audit Order with Forced
+ *         Re-Registration in pre-TIA/EIA-136-A Implementation
  *                      3GPP2 A.S0017-B                 IS-730
  *
  *   UIM
@@ -82,7 +82,7 @@
  *   Answer Hold
  *                      3GPP2 N.S0022-0 v1.0    IS-837
  *
- */ 
+ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -244,7 +244,7 @@ static int hf_ansi_map_cdmachanneldata_lc_mask_b1 = -1;
 static int hf_ansi_map_cdmachanneldata_np_ext = -1;
 static int hf_ansi_map_cdmachanneldata_nominal_pwr = -1;
 static int hf_ansi_map_cdmachanneldata_nr_preamble = -1;
- 
+
 static int hf_ansi_map_cdmastationclassmark_pc = -1;
 static int hf_ansi_map_cdmastationclassmark_dtx = -1;
 static int hf_ansi_map_cdmastationclassmark_smi = -1;
@@ -407,7 +407,7 @@ static void
 ansi_map_init_protocol(void)
 {
     ansi_map_init_transaction_table();
-} 
+}
 
 /* Store Invoke information needed for the corresponding reply */
 static void
@@ -422,8 +422,8 @@ update_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb
 
     buf=ep_alloc(1024);
 
-    src_str = address_to_str(src);
-    dst_str = address_to_str(dst);
+    src_str = ep_address_to_str(src);
+    dst_str = ep_address_to_str(dst);
 
     /* Data from the TCAP dissector */
     if (pinfo->private_data != NULL){
@@ -441,7 +441,7 @@ update_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb
             ansi_map_saved_invokedata->opcode = p_private_tcap->d.OperationCode_private;
             ansi_map_saved_invokedata->ServiceIndicator = ServiceIndicator;
 
-            g_hash_table_insert(TransactionId_table, 
+            g_hash_table_insert(TransactionId_table,
                                 g_strdup(buf),
                                 ansi_map_saved_invokedata);
             /*
@@ -583,7 +583,7 @@ static dgt_set_t Dgt1_9_bcd = {
      '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?'
     }
 };
-/* Assumes the rest of the tvb contains the digits to be turned into a string 
+/* Assumes the rest of the tvb contains the digits to be turned into a string
  */
 static char*
 unpack_digits2(tvbuff_t *tvb, int offset,dgt_set_t *dgt){
@@ -601,7 +601,7 @@ unpack_digits2(tvbuff_t *tvb, int offset,dgt_set_t *dgt){
     while ( offset < length ){
 
         octet = tvb_get_guint8(tvb,offset);
-        digit_str[i] = dgt->out[octet & 0x0f]; 
+        digit_str[i] = dgt->out[octet & 0x0f];
         i++;
 
         /*
@@ -612,7 +612,7 @@ unpack_digits2(tvbuff_t *tvb, int offset,dgt_set_t *dgt){
         if (octet == 0x0f)      /* odd number bytes - hit filler */
             break;
 
-        digit_str[i] = dgt->out[octet & 0x0f]; 
+        digit_str[i] = dgt->out[octet & 0x0f];
         i++;
         offset++;
 
@@ -684,7 +684,7 @@ static const value_string ansi_map_np_vals[]  = {
     {   0, NULL }
 };
 
-static void 
+static void
 dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
     char *digit_str;
     int   offset = 0;
@@ -699,7 +699,7 @@ dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
     proto_item_append_text(actx->created_item, " - %s", digit_str);
 }
 
-static void 
+static void
 dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
 
     guint8 octet , octet_len;
@@ -843,7 +843,7 @@ static const value_string ansi_map_sub_addr_type_vals[]  = {
     {   0, NULL }
 };
 
-static void 
+static void
 dissect_ansi_map_subaddress(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
     int offset = 0;
 
@@ -1147,7 +1147,7 @@ static const value_string ansi_map_authorizationperiod_period_vals[]  = {
 Number of minutes hours, days, weeks, or
 number of calls (as per Period). If Period
 indicates anything else the Value is set to zero
-on sending and ignored on receipt. 
+on sending and ignored on receipt.
 */
 static void
 dissect_ansi_map_authorizationperiod(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
@@ -1206,11 +1206,11 @@ static const value_string ansi_map_FeatureActivity_vals[]  = {
 static void
 dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
     int offset = 0;
-    int length; 
+    int length;
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset); 
+    length = tvb_length_remaining(tvb,offset);
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
@@ -1363,11 +1363,11 @@ static const true_false_string ansi_map_CDMACallMode_cls10_bool_val  = {
 static void
 dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
     int offset = 0;
-    int length; 
+    int length;
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset); 
+    length = tvb_length_remaining(tvb,offset);
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
@@ -1388,7 +1388,7 @@ dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     /* Call Mode (octet 1, bit A) */
     proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cdma, tvb, offset, 1, FALSE);
 
-    length--; 
+    length--;
     if ( length == 0)
         return;
     offset++;
@@ -1417,7 +1417,7 @@ static void
 dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
 
     int offset = 0;
-    int length; 
+    int length;
 
     proto_tree *subtree;
 
@@ -1612,7 +1612,7 @@ static const value_string ansi_map_CountUpdateReport_vals[]  = {
 };
 
 /* 6.5.2.53 DeniedAuthorizationPeriod */
-/* Period (octet 1) */ 
+/* Period (octet 1) */
 static const value_string ansi_map_deniedauthorizationperiod_period_vals[]  = {
     {   0, "Not used"},
     {   1, "Per Call. Re-authorization should be attempted on the next call attempt"},
@@ -1629,7 +1629,7 @@ static const value_string ansi_map_deniedauthorizationperiod_period_vals[]  = {
 Number of minutes hours, days, weeks, or
 number of calls (as per Period). If Period
 indicates anything else the Value is set to zero
-on sending and ignored on receipt. 
+on sending and ignored on receipt.
 */
 
 static void
@@ -2787,90 +2787,90 @@ static const value_string ansi_map_UniqueChallengeReport_vals[]  = {
 
 /* values copied from old ANSI map dissector */
 static const range_string cdmaserviceoption_vals[] = {
-    { 1, 1, "Basic Variable Rate Voice Service (8 kbps)" }, 
-    { 2, 2, "Mobile Station Loopback (8 kbps)" }, 
-    { 3, 3, "Enhanced Variable Rate Voice Service (8 kbps)" }, 
-    { 4, 4, "Asynchronous Data Service (9.6 kbps)" }, 
+    { 1, 1, "Basic Variable Rate Voice Service (8 kbps)" },
+    { 2, 2, "Mobile Station Loopback (8 kbps)" },
+    { 3, 3, "Enhanced Variable Rate Voice Service (8 kbps)" },
+    { 4, 4, "Asynchronous Data Service (9.6 kbps)" },
     { 5, 5, "Group 3 Facsimile (9.6 kbps)" },
-    { 6, 6, "Short Message Services (Rate Set 1)" }, 
-    { 7, 7, "Packet Data Service: Internet or ISO Protocol Stack (9.6 kbps)" }, 
-    { 8, 8, "Packet Data Service: CDPD Protocol Stack (9.6 kbps)" }, 
-    { 9, 9, "Mobile Station Loopback (13 kbps)" }, 
-    { 10, 10, "STU-III Transparent Service" }, 
-    { 11, 11, "STU-III Non-Transparent Service" }, 
-    { 12, 12, "Asynchronous Data Service (14.4 or 9.6 kbps)" }, 
-    { 13, 13, "Group 3 Facsimile (14.4 or 9.6 kbps)" }, 
-    { 14, 14, "Short Message Services (Rate Set 2)" }, 
-    { 15, 15, "Packet Data Service: Internet or ISO Protocol Stack (14.4 kbps)" }, 
-    { 16, 16, "Packet Data Service: CDPD Protocol Stack (14.4 kbps)" }, 
-    { 17, 17, "High Rate Voice Service (13 kbps)" }, 
-    { 18, 18, "Over-the-Air Parameter Administration (Rate Set 1)" }, 
-    { 19, 19, "Over-the-Air Parameter Administration (Rate Set 2)" }, 
-    { 20, 20, "Group 3 Analog Facsimile (Rate Set 1)" }, 
-    { 21, 21, "Group 3 Analog Facsimile (Rate Set 2)" }, 
-    { 22, 22, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS1 reverse)" }, 
-    { 23, 23, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS2 reverse)" }, 
-    { 24, 24, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS2 forward, RS1 reverse)" }, 
+    { 6, 6, "Short Message Services (Rate Set 1)" },
+    { 7, 7, "Packet Data Service: Internet or ISO Protocol Stack (9.6 kbps)" },
+    { 8, 8, "Packet Data Service: CDPD Protocol Stack (9.6 kbps)" },
+    { 9, 9, "Mobile Station Loopback (13 kbps)" },
+    { 10, 10, "STU-III Transparent Service" },
+    { 11, 11, "STU-III Non-Transparent Service" },
+    { 12, 12, "Asynchronous Data Service (14.4 or 9.6 kbps)" },
+    { 13, 13, "Group 3 Facsimile (14.4 or 9.6 kbps)" },
+    { 14, 14, "Short Message Services (Rate Set 2)" },
+    { 15, 15, "Packet Data Service: Internet or ISO Protocol Stack (14.4 kbps)" },
+    { 16, 16, "Packet Data Service: CDPD Protocol Stack (14.4 kbps)" },
+    { 17, 17, "High Rate Voice Service (13 kbps)" },
+    { 18, 18, "Over-the-Air Parameter Administration (Rate Set 1)" },
+    { 19, 19, "Over-the-Air Parameter Administration (Rate Set 2)" },
+    { 20, 20, "Group 3 Analog Facsimile (Rate Set 1)" },
+    { 21, 21, "Group 3 Analog Facsimile (Rate Set 2)" },
+    { 22, 22, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS1 reverse)" },
+    { 23, 23, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS2 reverse)" },
+    { 24, 24, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS2 forward, RS1 reverse)" },
     { 25, 25, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS2 forward, RS2 reverse)" },
-    { 26, 26, "High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS1 reverse)" }, 
-    { 27, 27, "High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS2 reverse)" }, 
-    { 28, 28, "High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS1 reverse)" }, 
-    { 29, 29, "High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS2 reverse)" }, 
-    { 30, 30, "Supplemental Channel Loopback Test for Rate Set 1" }, 
-    { 31, 31, "Supplemental Channel Loopback Test for Rate Set 2" }, 
-    { 32, 32, "Test Data Service Option (TDSO)" }, 
-    { 33, 33, "cdma2000 High Speed Packet Data Service, Internet or ISO Protocol Stack" }, 
-    { 34, 34, "cdma2000 High Speed Packet Data Service, CDPD Protocol Stack" }, 
+    { 26, 26, "High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS1 reverse)" },
+    { 27, 27, "High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS2 reverse)" },
+    { 28, 28, "High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS1 reverse)" },
+    { 29, 29, "High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS2 reverse)" },
+    { 30, 30, "Supplemental Channel Loopback Test for Rate Set 1" },
+    { 31, 31, "Supplemental Channel Loopback Test for Rate Set 2" },
+    { 32, 32, "Test Data Service Option (TDSO)" },
+    { 33, 33, "cdma2000 High Speed Packet Data Service, Internet or ISO Protocol Stack" },
+    { 34, 34, "cdma2000 High Speed Packet Data Service, CDPD Protocol Stack" },
     { 35, 35, "Location Services, Rate Set 1 (9.6 kbps)" },
-    { 36, 36, "Location Services, Rate Set 2 (14.4 kbps)" }, 
-    { 37, 37, "ISDN Interworking Service (64 kbps)" }, 
-    { 38, 38, "GSM Voice" }, 
-    { 39, 39, "GSM Circuit Data" }, 
-    { 40, 40, "GSM Packet Data" }, 
-    { 41, 41, "GSM Short Message Service" }, 
-    { 42, 42, "None Reserved for MC-MAP standard service options" }, 
-    { 54, 54, "Markov Service Option (MSO)" }, 
+    { 36, 36, "Location Services, Rate Set 2 (14.4 kbps)" },
+    { 37, 37, "ISDN Interworking Service (64 kbps)" },
+    { 38, 38, "GSM Voice" },
+    { 39, 39, "GSM Circuit Data" },
+    { 40, 40, "GSM Packet Data" },
+    { 41, 41, "GSM Short Message Service" },
+    { 42, 42, "None Reserved for MC-MAP standard service options" },
+    { 54, 54, "Markov Service Option (MSO)" },
     { 55, 55, "Loopback Service Option (LSO)" },
-    { 56, 56, "Selectable Mode Vocoder" }, 
-    { 57, 57, "32 kbps Circuit Video Conferencing" }, 
-    { 58, 58, "64 kbps Circuit Video Conferencing" }, 
-    { 59, 59, "HRPD Accounting Records Identifier" }, 
-    { 60, 60, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Removal" }, 
-    { 61, 61, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Compression" }, 
+    { 56, 56, "Selectable Mode Vocoder" },
+    { 57, 57, "32 kbps Circuit Video Conferencing" },
+    { 58, 58, "64 kbps Circuit Video Conferencing" },
+    { 59, 59, "HRPD Accounting Records Identifier" },
+    { 60, 60, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Removal" },
+    { 61, 61, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Compression" },
     { 62, 62, "Source-Controlled Variable-Rate Multimode Wideband Speech Codec (VMR-WB) Rate Set 2" },
     { 63, 63, "Source-Controlled Variable-Rate Multimode Wideband Speech Codec (VMR-WB) Rate Set 1" },
     { 64, 64, "HRPD auxiliary Packet Data Service instance" },
     { 65, 65, "cdma2000/GPRS Inter-working" },
     { 66, 66, "cdma2000 High Speed Packet Data Service, Internet or ISO Protocol Stack" },
     { 67, 67, "HRPD Packet Data IP Service where Higher Layer Protocol is IP or ROHC" },
-    { 68, 68, "Enhanced Variable Rate Voice Service (EVRC-B)" }, 
+    { 68, 68, "Enhanced Variable Rate Voice Service (EVRC-B)" },
     { 69, 69, "HRPD Packet Data Service, which when used in paging over the 1x air interface, a page response is required" },
-    { 70, 70, "Enhanced Variable Rate Voice Service (EVRC-WB)" }, 
-    { 71, 4099, "None Reserved for standard service options" }, 
-    { 4100, 4100, "Asynchronous Data Service, Revision 1 (9.6 or 14.4 kbps)" }, 
-    { 4101, 4101, "Group 3 Facsimile, Revision 1 (9.6 or 14.4 kbps)" }, 
+    { 70, 70, "Enhanced Variable Rate Voice Service (EVRC-WB)" },
+    { 71, 4099, "None Reserved for standard service options" },
+    { 4100, 4100, "Asynchronous Data Service, Revision 1 (9.6 or 14.4 kbps)" },
+    { 4101, 4101, "Group 3 Facsimile, Revision 1 (9.6 or 14.4 kbps)" },
     { 4102, 4102, "Reserved for standard service option" },
-    { 4103, 4103, "Packet Data Service: Internet or ISO Protocol Stack, Revision 1 (9.6 or 14.4 kbps)" }, 
-    { 4104, 4104, "Packet Data Service: CDPD Protocol Stack, Revision 1 (9.6 or 14.4 kbps)" }, 
-    { 4105, 32767, "Reserved for standard service options" }, 
-    { 32768, 32768, "QCELP (13 kbps)" }, 
-    { 32769, 32771, "Proprietary QUALCOMM Incorporated" }, 
-    { 32772, 32775, "Proprietary OKI Telecom" }, 
-    { 32776, 32779, "Proprietary Lucent Technologies" }, 
-    { 32780, 32783, "Nokia" }, 
-    { 32784, 32787, "NORTEL NETWORKS" }, 
-    { 32788, 32791, "Sony Electronics Inc" }, 
-    { 32792, 32795, "Motorola" }, 
-    { 32796, 32799, "QUALCOMM Incorporated" }, 
-    { 32800, 32803, "QUALCOMM Incorporated" }, 
-    { 32804, 32807, "QUALCOMM Incorporated" }, 
-    { 32808, 32811, "QUALCOMM Incorporated" }, 
-    { 32812, 32815, "Lucent Technologies" }, 
-    { 32816, 32819, "Denso International" }, 
-    { 32820, 32823, "Motorola" }, 
-    { 32824, 32827, "Denso International" }, 
-    { 32828, 32831, "Denso International" }, 
-    { 32832, 32835, "Denso International" }, 
+    { 4103, 4103, "Packet Data Service: Internet or ISO Protocol Stack, Revision 1 (9.6 or 14.4 kbps)" },
+    { 4104, 4104, "Packet Data Service: CDPD Protocol Stack, Revision 1 (9.6 or 14.4 kbps)" },
+    { 4105, 32767, "Reserved for standard service options" },
+    { 32768, 32768, "QCELP (13 kbps)" },
+    { 32769, 32771, "Proprietary QUALCOMM Incorporated" },
+    { 32772, 32775, "Proprietary OKI Telecom" },
+    { 32776, 32779, "Proprietary Lucent Technologies" },
+    { 32780, 32783, "Nokia" },
+    { 32784, 32787, "NORTEL NETWORKS" },
+    { 32788, 32791, "Sony Electronics Inc" },
+    { 32792, 32795, "Motorola" },
+    { 32796, 32799, "QUALCOMM Incorporated" },
+    { 32800, 32803, "QUALCOMM Incorporated" },
+    { 32804, 32807, "QUALCOMM Incorporated" },
+    { 32808, 32811, "QUALCOMM Incorporated" },
+    { 32812, 32815, "Lucent Technologies" },
+    { 32816, 32819, "Denso International" },
+    { 32820, 32823, "Motorola" },
+    { 32824, 32827, "Denso International" },
+    { 32828, 32831, "Denso International" },
+    { 32832, 32835, "Denso International" },
     { 32836, 32839, "NEC America" },
     { 32840, 32843, "Samsung Electronics" },
     { 32844, 32847, "Texas Instruments Incorporated" },
@@ -3036,7 +3036,7 @@ static const value_string ansi_map_TDMABandwidth_vals[]  = {
 };
 
 /* 6.5.2.az TDMADataFeaturesIndicator N.S0008-0 v 1.0 */
-/* TDMADataFeaturesIndicator 
+/* TDMADataFeaturesIndicator
    ansi_map_FeatureActivity_vals
 
    ADS FeatureActivity ADS-FA ( octet 1 bit A and B )
@@ -3862,7 +3862,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
     case  59: /*Change Service*/
         offset = dissect_ansi_map_ChangeService(TRUE, tvb, offset, actx, tree, hf_ansi_map_changeService);
         break;
-        /* End N.S0008-0 v 1.0 */       
+        /* End N.S0008-0 v 1.0 */
     case  60: /*Parameter Request*/
         offset = dissect_ansi_map_ParameterRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_parameterRequest);
         break;
@@ -4010,7 +4010,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
         /* CheckMEID X.S0008-0 v1.0*/
     case 104:
         offset = dissect_ansi_map_CheckMEID(TRUE, tvb, offset, actx, tree, hf_ansi_map_checkMEID);
-        break;  
+        break;
         /* PositionEventNotification */
     case 106:
         offset = dissect_ansi_map_PositionEventNotification(TRUE, tvb, offset, actx, tree, hf_ansi_map_positionEventNotification);
@@ -4251,7 +4251,7 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
         /* CheckMEID X.S0008-0 v1.0*/
     case 104:
         offset = dissect_ansi_map_CheckMEIDRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_checkMEIDRes);
-        break;  
+        break;
         /* PositionEventNotification *
            case 106:
            offset = dissect_ansi_map_PositionEventNotification(TRUE, tvb, offset, actx, tree, hf_ansi_map_positionEventNotificationRes);
@@ -4289,15 +4289,15 @@ find_saved_invokedata(asn1_ctx_t *actx){
     char *buf;
 
     buf=ep_alloc(1024);
-    src_str = address_to_str(src);
-    dst_str = address_to_str(dst);
+    src_str = ep_address_to_str(src);
+    dst_str = ep_address_to_str(dst);
 
     /* Data from the TCAP dissector */
     if (actx->pinfo->private_data != NULL){
         p_private_tcap=actx->pinfo->private_data;
         /* The hash string needs to contain src and dest to distiguish differnt flows */
-        src_str = address_to_str(src);
-        dst_str = address_to_str(dst);
+        src_str = ep_address_to_str(src);
+        dst_str = ep_address_to_str(dst);
         /* Reverse order to invoke */
         g_snprintf(buf,1024,"%s%s%s",p_private_tcap->TransactionID_str,dst_str,src_str);
         /*
@@ -4354,9 +4354,9 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     p_private_tcap=pinfo->private_data;
 
     switch(p_private_tcap->d.pdu){
-        /* 
-           1 : invoke, 
-           2 : returnResult, 
+        /*
+           1 : invoke,
+           2 : returnResult,
            3 : returnError,
            4 : reject
         */
@@ -4624,7 +4624,7 @@ void proto_register_ansi_map(void) {
         { &hf_ansi_map_trans_cap_ndss,
           { "NDSS Capability (NDSS)", "ansi_map.trans_cap_ndss",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_ndss_bool_val),0x40,
-            NULL, HFILL }},         
+            NULL, HFILL }},
         { &hf_ansi_map_trans_cap_nami,
           { "NAME Capability Indicator (NAMI)", "ansi_map.trans_cap_nami",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_nami_bool_val),0x80,
@@ -4776,7 +4776,7 @@ void proto_register_ansi_map(void) {
           { "Priority Call Waiting FeatureActivity PCW-FA", "ansi_map.callingfeaturesindicator.pcwfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
             NULL, HFILL }},
-          
+
         { &hf_ansi_map_callingfeaturesindicator_dpfa,
           { "Data Privacy Feature Activity DP-FA", "ansi_map.callingfeaturesindicator.dpfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
@@ -5239,7 +5239,7 @@ void proto_register_ansi_map(void) {
           { "PACA Level", "ansi_map.PACA_Level",
             FT_UINT8, BASE_DEC, VALS(ansi_map_PACA_Level_vals), 0x1e,
             NULL, HFILL }},
-                
+
 #include "packet-ansi_map-hfarr.c"
     };
 
@@ -5282,7 +5282,7 @@ void proto_register_ansi_map(void) {
     /* Register fields and subtrees */
     proto_register_field_array(proto_ansi_map, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
- 
+
     register_dissector("ansi_map", dissect_ansi_map, proto_ansi_map);
 
     is637_tele_id_dissector_table =
@@ -5303,7 +5303,7 @@ void proto_register_ansi_map(void) {
     range_convert_str(&global_ssn_range, "5-14", MAX_SSN);
 
     ansi_map_module = prefs_register_protocol(proto_ansi_map, proto_reg_handoff_ansi_map);
-    
+
 
     prefs_register_range_preference(ansi_map_module, "map.ssn", "ANSI MAP SSNs",
                                     "ANSI MAP SSNs to decode as ANSI MAP",
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 3969832e14..990811d890 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -296,7 +296,7 @@ static void h223_lc_init( void )
 	h223_fw_lc_num = 0;
 }
 
-static void h245_init(void) 
+static void h245_init(void)
 {
 	if ( h245_pending_olc_reqs)
 		g_hash_table_destroy(h245_pending_olc_reqs);
@@ -312,7 +312,7 @@ void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle )
 
 static const gchar *gen_olc_key(guint16 lc_num, address *dst_addr, address *src_addr)
 {
-  return ep_strdup_printf("%s/%s/%u", address_to_str(dst_addr), address_to_str(src_addr), lc_num);
+  return ep_strdup_printf("%s/%s/%u", ep_address_to_str(dst_addr), ep_address_to_str(src_addr), lc_num);
 }
 
 static void update_unicast_addr(unicast_addr_t *req_addr, unicast_addr_t *ack_addr)
@@ -335,8 +335,8 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
 	/* T.38 */
 	if (!strcmp(upcoming_channel->data_type_str, "t38fax")) {
 		if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && t38_handle) {
-			t38_add_address(pinfo, &upcoming_channel->media_addr.addr, 
-							upcoming_channel->media_addr.port, 0, 
+			t38_add_address(pinfo, &upcoming_channel->media_addr.addr,
+							upcoming_channel->media_addr.port, 0,
 							"H245", pinfo->fd->num);
 		}
 		return;
@@ -357,13 +357,13 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
 	/* DEBUG 	g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel->media_addr.addr.type, upcoming_channel->media_addr.port );
 	*/
 	if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && rtp_handle) {
-		srtp_add_address(pinfo, &upcoming_channel->media_addr.addr, 
-						upcoming_channel->media_addr.port, 0, 
+		srtp_add_address(pinfo, &upcoming_channel->media_addr.addr,
+						upcoming_channel->media_addr.port, 0,
 						"H245", pinfo->fd->num, upcoming_channel->is_video , rtp_dyn_payload, dummy_srtp_info);
 	}
 	if (upcoming_channel->media_control_addr.addr.type!=AT_NONE && upcoming_channel->media_control_addr.port!=0 && rtcp_handle) {
-		srtcp_add_address(pinfo, &upcoming_channel->media_control_addr.addr, 
-						upcoming_channel->media_control_addr.port, 0, 
+		srtcp_add_address(pinfo, &upcoming_channel->media_control_addr.addr,
+						upcoming_channel->media_control_addr.port, 0,
 						"H245", pinfo->fd->num, dummy_srtp_info);
 	}
 }
@@ -442,7 +442,7 @@ dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 
   dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree);
 
-  if (h245_pi != NULL) 
+  if (h245_pi != NULL)
 	  h245_pi->msg_type = H245_OpenLogChn;
 
   if (codec_str && codec_type){
@@ -521,7 +521,7 @@ void proto_register_h245(void) {
   oid_add_from_string("ISO/IEC 14496-2 MPEG-4 video","0.0.8.245.1.0.0");
   /* This capability is defined in Annex H. */
   oid_add_from_string("ISO/IEC 14496-3 MPEG-4 audio","0.0.8.245.1.1.0");
-  /* This capability is defined in Annex I. */	
+  /* This capability is defined in Annex I. */
   oid_add_from_string("AMR","0.0.8.245.1.1.1");
   /* This capability is defined in Annex J. */
   oid_add_from_string("acelp","0.0.8.245.1.1.2");
@@ -543,7 +543,7 @@ void proto_register_h245(void) {
   oid_add_from_string("AMR-WB","0.0.8.245.1.1.10");
   /* This capability is defined in Annex S. */
   oid_add_from_string("ilbc","0.0.8.245.1.1.11");
-  
+
   oid_add_from_string("ISO/IEC 14496-1","0.0.8.245.1.2.0");
   oid_add_from_string("Nx64","0.0.8.245.1.2.1");
   oid_add_from_string("logical-channel-bit-ratemanagement","0.0.8.245.1.3.0");
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 890ded778b..5a1f4e22f4 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2695,13 +2695,13 @@ const gchar *get_addr_name(address *addr)
   }
 
   /* if it gets here, either it is of type AT_NONE, */
-  /* or it should be solvable in address_to_str -unless addr->type is wrongly defined- */
+  /* or it should be solvable in ep_address_to_str -unless addr->type is wrongly defined- */
 
   if (addr->type == AT_NONE){
 	  return "NONE";
   }
 
-  return(address_to_str(addr));
+  return(ep_address_to_str(addr));
 } /* get_addr_name */
 
 
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 88461c271a..87300f6158 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-/* The buffers returned by these functions are all allocated with a 
- * packet lifetime and does not have have to be freed. 
+/* The buffers returned by these functions are all allocated with a
+ * packet lifetime and does not have have to be freed.
  * However, take into account that when the packet dissection
  * completes, these buffers will be automatically reclaimed/freed.
  * If you need the buffer to remain for a longer scope than packet lifetime
@@ -102,7 +102,7 @@ extern gchar *get_sctp_port(guint port);
 /*  - if the address is of a type that can be translated into a name, and the user */
 /*    has activated name resolution, the translated name */
 /*  - if the address is of type AT_NONE, a pointer to the string "NONE" */
-/*  - if the address is of any other type, the result of address_to_str on the argument, */
+/*  - if the address is of any other type, the result of ep_address_to_str on the argument, */
 /*    which should be a string representation for the answer -e.g. "10.10.10.10" for IPv4 */
 /*    address 10.10.10.10 */
 
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index ae9f179205..7a1390e2e5 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -491,7 +491,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off
     /* Append port and address to tree item */
     IPv4 = tvb_get_ipv4(tvb, offset);
     SET_ADDRESS(&addr, AT_IPv4, sizeof(IPv4), &IPv4);
-    proto_item_append_text(pi, " %s, Port %d", address_to_str(&addr), port);
+    proto_item_append_text(pi, " %s, Port %d", ep_address_to_str(&addr), port);
     offset += 4;
     break;
   case ACN_ADDR_IPV6:
@@ -509,7 +509,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off
     /* Append port and address to tree item */
     tvb_get_ipv6(tvb, offset, &IPv6);
     SET_ADDRESS(&addr, AT_IPv6, sizeof(struct e_in6_addr), &IPv6);
-    proto_item_append_text(pi, " %s, Port %d", address_to_str(&addr), port);
+    proto_item_append_text(pi, " %s, Port %d", ep_address_to_str(&addr), port);
     offset += 16;
     break;
   case ACN_ADDR_IPPORT:
@@ -522,7 +522,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off
     port = tvb_get_ntohs(tvb, offset);
     proto_tree_add_item(addr_tree, hf_acn_port, tvb, offset, 2, FALSE);
     /* Append port to tree item */
-    proto_item_append_text(pi, " %s Port %d", address_to_str(&addr), port);
+    proto_item_append_text(pi, " %s Port %d", ep_address_to_str(&addr), port);
     offset += 2;
     break;
   }
@@ -3028,7 +3028,7 @@ void proto_register_acn(void)
     "ACN",                               /* short name */
     "acn"                                /* abbrev */
     );
-  
+
   proto_register_field_array(proto_acn, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index d5803e02f4..6b7ba9a453 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -40,7 +40,7 @@
  * Title                3GPP2                   Other
  *
  *   Cellular Radiotelecommunications Intersystem Operations
- *                      3GPP2 N.S0005-0 v 1.0           ANSI/TIA/EIA-41-D 
+ *                      3GPP2 N.S0005-0 v 1.0           ANSI/TIA/EIA-41-D
  *
  *   Network Support for MDN-Based Message Centers
  *                      3GPP2 N.S0024-0 v1.0    IS-841
@@ -70,8 +70,8 @@
  *   WIN Phase 1
  *                      3GPP2 N.S0013-0 v1.0    IS-771
  *
- *       DCCH (Clarification of Audit Order with Forced 
- *         Re-Registration in pre-TIA/EIA-136-A Implementation 
+ *       DCCH (Clarification of Audit Order with Forced
+ *         Re-Registration in pre-TIA/EIA-136-A Implementation
  *                      3GPP2 A.S0017-B                 IS-730
  *
  *   UIM
@@ -90,7 +90,7 @@
  *   Answer Hold
  *                      3GPP2 N.S0022-0 v1.0    IS-837
  *
- */ 
+ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -252,7 +252,7 @@ static int hf_ansi_map_cdmachanneldata_lc_mask_b1 = -1;
 static int hf_ansi_map_cdmachanneldata_np_ext = -1;
 static int hf_ansi_map_cdmachanneldata_nominal_pwr = -1;
 static int hf_ansi_map_cdmachanneldata_nr_preamble = -1;
- 
+
 static int hf_ansi_map_cdmastationclassmark_pc = -1;
 static int hf_ansi_map_cdmastationclassmark_dtx = -1;
 static int hf_ansi_map_cdmastationclassmark_smi = -1;
@@ -1193,7 +1193,7 @@ static void
 ansi_map_init_protocol(void)
 {
     ansi_map_init_transaction_table();
-} 
+}
 
 /* Store Invoke information needed for the corresponding reply */
 static void
@@ -1208,8 +1208,8 @@ update_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb
 
     buf=ep_alloc(1024);
 
-    src_str = address_to_str(src);
-    dst_str = address_to_str(dst);
+    src_str = ep_address_to_str(src);
+    dst_str = ep_address_to_str(dst);
 
     /* Data from the TCAP dissector */
     if (pinfo->private_data != NULL){
@@ -1227,7 +1227,7 @@ update_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb
             ansi_map_saved_invokedata->opcode = p_private_tcap->d.OperationCode_private;
             ansi_map_saved_invokedata->ServiceIndicator = ServiceIndicator;
 
-            g_hash_table_insert(TransactionId_table, 
+            g_hash_table_insert(TransactionId_table,
                                 g_strdup(buf),
                                 ansi_map_saved_invokedata);
             /*
@@ -1369,7 +1369,7 @@ static dgt_set_t Dgt1_9_bcd = {
      '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?'
     }
 };
-/* Assumes the rest of the tvb contains the digits to be turned into a string 
+/* Assumes the rest of the tvb contains the digits to be turned into a string
  */
 static char*
 unpack_digits2(tvbuff_t *tvb, int offset,dgt_set_t *dgt){
@@ -1387,7 +1387,7 @@ unpack_digits2(tvbuff_t *tvb, int offset,dgt_set_t *dgt){
     while ( offset < length ){
 
         octet = tvb_get_guint8(tvb,offset);
-        digit_str[i] = dgt->out[octet & 0x0f]; 
+        digit_str[i] = dgt->out[octet & 0x0f];
         i++;
 
         /*
@@ -1398,7 +1398,7 @@ unpack_digits2(tvbuff_t *tvb, int offset,dgt_set_t *dgt){
         if (octet == 0x0f)      /* odd number bytes - hit filler */
             break;
 
-        digit_str[i] = dgt->out[octet & 0x0f]; 
+        digit_str[i] = dgt->out[octet & 0x0f];
         i++;
         offset++;
 
@@ -1470,7 +1470,7 @@ static const value_string ansi_map_np_vals[]  = {
     {   0, NULL }
 };
 
-static void 
+static void
 dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
     char *digit_str;
     int   offset = 0;
@@ -1485,7 +1485,7 @@ dissect_ansi_map_min_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
     proto_item_append_text(actx->created_item, " - %s", digit_str);
 }
 
-static void 
+static void
 dissect_ansi_map_digits_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
 
     guint8 octet , octet_len;
@@ -1629,7 +1629,7 @@ static const value_string ansi_map_sub_addr_type_vals[]  = {
     {   0, NULL }
 };
 
-static void 
+static void
 dissect_ansi_map_subaddress(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
     int offset = 0;
 
@@ -1933,7 +1933,7 @@ static const value_string ansi_map_authorizationperiod_period_vals[]  = {
 Number of minutes hours, days, weeks, or
 number of calls (as per Period). If Period
 indicates anything else the Value is set to zero
-on sending and ignored on receipt. 
+on sending and ignored on receipt.
 */
 static void
 dissect_ansi_map_authorizationperiod(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
@@ -1992,11 +1992,11 @@ static const value_string ansi_map_FeatureActivity_vals[]  = {
 static void
 dissect_ansi_map_callingfeaturesindicator(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
     int offset = 0;
-    int length; 
+    int length;
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset); 
+    length = tvb_length_remaining(tvb,offset);
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
 
@@ -2149,11 +2149,11 @@ static const true_false_string ansi_map_CDMACallMode_cls10_bool_val  = {
 static void
 dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
     int offset = 0;
-    int length; 
+    int length;
 
     proto_tree *subtree;
 
-    length = tvb_length_remaining(tvb,offset); 
+    length = tvb_length_remaining(tvb,offset);
 
 
     subtree = proto_item_add_subtree(actx->created_item, ett_mscid);
@@ -2174,7 +2174,7 @@ dissect_ansi_map_cdmacallmode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
     /* Call Mode (octet 1, bit A) */
     proto_tree_add_item(subtree, hf_ansi_map_cdmacallmode_cdma, tvb, offset, 1, FALSE);
 
-    length--; 
+    length--;
     if ( length == 0)
         return;
     offset++;
@@ -2203,7 +2203,7 @@ static void
 dissect_ansi_map_cdmachanneldata(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, asn1_ctx_t *actx _U_){
 
     int offset = 0;
-    int length; 
+    int length;
 
     proto_tree *subtree;
 
@@ -2398,7 +2398,7 @@ static const value_string ansi_map_CountUpdateReport_vals[]  = {
 };
 
 /* 6.5.2.53 DeniedAuthorizationPeriod */
-/* Period (octet 1) */ 
+/* Period (octet 1) */
 static const value_string ansi_map_deniedauthorizationperiod_period_vals[]  = {
     {   0, "Not used"},
     {   1, "Per Call. Re-authorization should be attempted on the next call attempt"},
@@ -2415,7 +2415,7 @@ static const value_string ansi_map_deniedauthorizationperiod_period_vals[]  = {
 Number of minutes hours, days, weeks, or
 number of calls (as per Period). If Period
 indicates anything else the Value is set to zero
-on sending and ignored on receipt. 
+on sending and ignored on receipt.
 */
 
 static void
@@ -3573,90 +3573,90 @@ static const value_string ansi_map_UniqueChallengeReport_vals[]  = {
 
 /* values copied from old ANSI map dissector */
 static const range_string cdmaserviceoption_vals[] = {
-    { 1, 1, "Basic Variable Rate Voice Service (8 kbps)" }, 
-    { 2, 2, "Mobile Station Loopback (8 kbps)" }, 
-    { 3, 3, "Enhanced Variable Rate Voice Service (8 kbps)" }, 
-    { 4, 4, "Asynchronous Data Service (9.6 kbps)" }, 
+    { 1, 1, "Basic Variable Rate Voice Service (8 kbps)" },
+    { 2, 2, "Mobile Station Loopback (8 kbps)" },
+    { 3, 3, "Enhanced Variable Rate Voice Service (8 kbps)" },
+    { 4, 4, "Asynchronous Data Service (9.6 kbps)" },
     { 5, 5, "Group 3 Facsimile (9.6 kbps)" },
-    { 6, 6, "Short Message Services (Rate Set 1)" }, 
-    { 7, 7, "Packet Data Service: Internet or ISO Protocol Stack (9.6 kbps)" }, 
-    { 8, 8, "Packet Data Service: CDPD Protocol Stack (9.6 kbps)" }, 
-    { 9, 9, "Mobile Station Loopback (13 kbps)" }, 
-    { 10, 10, "STU-III Transparent Service" }, 
-    { 11, 11, "STU-III Non-Transparent Service" }, 
-    { 12, 12, "Asynchronous Data Service (14.4 or 9.6 kbps)" }, 
-    { 13, 13, "Group 3 Facsimile (14.4 or 9.6 kbps)" }, 
-    { 14, 14, "Short Message Services (Rate Set 2)" }, 
-    { 15, 15, "Packet Data Service: Internet or ISO Protocol Stack (14.4 kbps)" }, 
-    { 16, 16, "Packet Data Service: CDPD Protocol Stack (14.4 kbps)" }, 
-    { 17, 17, "High Rate Voice Service (13 kbps)" }, 
-    { 18, 18, "Over-the-Air Parameter Administration (Rate Set 1)" }, 
-    { 19, 19, "Over-the-Air Parameter Administration (Rate Set 2)" }, 
-    { 20, 20, "Group 3 Analog Facsimile (Rate Set 1)" }, 
-    { 21, 21, "Group 3 Analog Facsimile (Rate Set 2)" }, 
-    { 22, 22, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS1 reverse)" }, 
-    { 23, 23, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS2 reverse)" }, 
-    { 24, 24, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS2 forward, RS1 reverse)" }, 
+    { 6, 6, "Short Message Services (Rate Set 1)" },
+    { 7, 7, "Packet Data Service: Internet or ISO Protocol Stack (9.6 kbps)" },
+    { 8, 8, "Packet Data Service: CDPD Protocol Stack (9.6 kbps)" },
+    { 9, 9, "Mobile Station Loopback (13 kbps)" },
+    { 10, 10, "STU-III Transparent Service" },
+    { 11, 11, "STU-III Non-Transparent Service" },
+    { 12, 12, "Asynchronous Data Service (14.4 or 9.6 kbps)" },
+    { 13, 13, "Group 3 Facsimile (14.4 or 9.6 kbps)" },
+    { 14, 14, "Short Message Services (Rate Set 2)" },
+    { 15, 15, "Packet Data Service: Internet or ISO Protocol Stack (14.4 kbps)" },
+    { 16, 16, "Packet Data Service: CDPD Protocol Stack (14.4 kbps)" },
+    { 17, 17, "High Rate Voice Service (13 kbps)" },
+    { 18, 18, "Over-the-Air Parameter Administration (Rate Set 1)" },
+    { 19, 19, "Over-the-Air Parameter Administration (Rate Set 2)" },
+    { 20, 20, "Group 3 Analog Facsimile (Rate Set 1)" },
+    { 21, 21, "Group 3 Analog Facsimile (Rate Set 2)" },
+    { 22, 22, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS1 reverse)" },
+    { 23, 23, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS1 forward, RS2 reverse)" },
+    { 24, 24, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS2 forward, RS1 reverse)" },
     { 25, 25, "High Speed Packet Data Service: Internet or ISO Protocol Stack (RS2 forward, RS2 reverse)" },
-    { 26, 26, "High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS1 reverse)" }, 
-    { 27, 27, "High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS2 reverse)" }, 
-    { 28, 28, "High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS1 reverse)" }, 
-    { 29, 29, "High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS2 reverse)" }, 
-    { 30, 30, "Supplemental Channel Loopback Test for Rate Set 1" }, 
-    { 31, 31, "Supplemental Channel Loopback Test for Rate Set 2" }, 
-    { 32, 32, "Test Data Service Option (TDSO)" }, 
-    { 33, 33, "cdma2000 High Speed Packet Data Service, Internet or ISO Protocol Stack" }, 
-    { 34, 34, "cdma2000 High Speed Packet Data Service, CDPD Protocol Stack" }, 
+    { 26, 26, "High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS1 reverse)" },
+    { 27, 27, "High Speed Packet Data Service: CDPD Protocol Stack (RS1 forward, RS2 reverse)" },
+    { 28, 28, "High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS1 reverse)" },
+    { 29, 29, "High Speed Packet Data Service: CDPD Protocol Stack (RS2 forward, RS2 reverse)" },
+    { 30, 30, "Supplemental Channel Loopback Test for Rate Set 1" },
+    { 31, 31, "Supplemental Channel Loopback Test for Rate Set 2" },
+    { 32, 32, "Test Data Service Option (TDSO)" },
+    { 33, 33, "cdma2000 High Speed Packet Data Service, Internet or ISO Protocol Stack" },
+    { 34, 34, "cdma2000 High Speed Packet Data Service, CDPD Protocol Stack" },
     { 35, 35, "Location Services, Rate Set 1 (9.6 kbps)" },
-    { 36, 36, "Location Services, Rate Set 2 (14.4 kbps)" }, 
-    { 37, 37, "ISDN Interworking Service (64 kbps)" }, 
-    { 38, 38, "GSM Voice" }, 
-    { 39, 39, "GSM Circuit Data" }, 
-    { 40, 40, "GSM Packet Data" }, 
-    { 41, 41, "GSM Short Message Service" }, 
-    { 42, 42, "None Reserved for MC-MAP standard service options" }, 
-    { 54, 54, "Markov Service Option (MSO)" }, 
+    { 36, 36, "Location Services, Rate Set 2 (14.4 kbps)" },
+    { 37, 37, "ISDN Interworking Service (64 kbps)" },
+    { 38, 38, "GSM Voice" },
+    { 39, 39, "GSM Circuit Data" },
+    { 40, 40, "GSM Packet Data" },
+    { 41, 41, "GSM Short Message Service" },
+    { 42, 42, "None Reserved for MC-MAP standard service options" },
+    { 54, 54, "Markov Service Option (MSO)" },
     { 55, 55, "Loopback Service Option (LSO)" },
-    { 56, 56, "Selectable Mode Vocoder" }, 
-    { 57, 57, "32 kbps Circuit Video Conferencing" }, 
-    { 58, 58, "64 kbps Circuit Video Conferencing" }, 
-    { 59, 59, "HRPD Accounting Records Identifier" }, 
-    { 60, 60, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Removal" }, 
-    { 61, 61, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Compression" }, 
+    { 56, 56, "Selectable Mode Vocoder" },
+    { 57, 57, "32 kbps Circuit Video Conferencing" },
+    { 58, 58, "64 kbps Circuit Video Conferencing" },
+    { 59, 59, "HRPD Accounting Records Identifier" },
+    { 60, 60, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Removal" },
+    { 61, 61, "Link Layer Assisted Robust Header Compression (LLA ROHC) - Header Compression" },
     { 62, 62, "Source-Controlled Variable-Rate Multimode Wideband Speech Codec (VMR-WB) Rate Set 2" },
     { 63, 63, "Source-Controlled Variable-Rate Multimode Wideband Speech Codec (VMR-WB) Rate Set 1" },
     { 64, 64, "HRPD auxiliary Packet Data Service instance" },
     { 65, 65, "cdma2000/GPRS Inter-working" },
     { 66, 66, "cdma2000 High Speed Packet Data Service, Internet or ISO Protocol Stack" },
     { 67, 67, "HRPD Packet Data IP Service where Higher Layer Protocol is IP or ROHC" },
-    { 68, 68, "Enhanced Variable Rate Voice Service (EVRC-B)" }, 
+    { 68, 68, "Enhanced Variable Rate Voice Service (EVRC-B)" },
     { 69, 69, "HRPD Packet Data Service, which when used in paging over the 1x air interface, a page response is required" },
-    { 70, 70, "Enhanced Variable Rate Voice Service (EVRC-WB)" }, 
-    { 71, 4099, "None Reserved for standard service options" }, 
-    { 4100, 4100, "Asynchronous Data Service, Revision 1 (9.6 or 14.4 kbps)" }, 
-    { 4101, 4101, "Group 3 Facsimile, Revision 1 (9.6 or 14.4 kbps)" }, 
+    { 70, 70, "Enhanced Variable Rate Voice Service (EVRC-WB)" },
+    { 71, 4099, "None Reserved for standard service options" },
+    { 4100, 4100, "Asynchronous Data Service, Revision 1 (9.6 or 14.4 kbps)" },
+    { 4101, 4101, "Group 3 Facsimile, Revision 1 (9.6 or 14.4 kbps)" },
     { 4102, 4102, "Reserved for standard service option" },
-    { 4103, 4103, "Packet Data Service: Internet or ISO Protocol Stack, Revision 1 (9.6 or 14.4 kbps)" }, 
-    { 4104, 4104, "Packet Data Service: CDPD Protocol Stack, Revision 1 (9.6 or 14.4 kbps)" }, 
-    { 4105, 32767, "Reserved for standard service options" }, 
-    { 32768, 32768, "QCELP (13 kbps)" }, 
-    { 32769, 32771, "Proprietary QUALCOMM Incorporated" }, 
-    { 32772, 32775, "Proprietary OKI Telecom" }, 
-    { 32776, 32779, "Proprietary Lucent Technologies" }, 
-    { 32780, 32783, "Nokia" }, 
-    { 32784, 32787, "NORTEL NETWORKS" }, 
-    { 32788, 32791, "Sony Electronics Inc" }, 
-    { 32792, 32795, "Motorola" }, 
-    { 32796, 32799, "QUALCOMM Incorporated" }, 
-    { 32800, 32803, "QUALCOMM Incorporated" }, 
-    { 32804, 32807, "QUALCOMM Incorporated" }, 
-    { 32808, 32811, "QUALCOMM Incorporated" }, 
-    { 32812, 32815, "Lucent Technologies" }, 
-    { 32816, 32819, "Denso International" }, 
-    { 32820, 32823, "Motorola" }, 
-    { 32824, 32827, "Denso International" }, 
-    { 32828, 32831, "Denso International" }, 
-    { 32832, 32835, "Denso International" }, 
+    { 4103, 4103, "Packet Data Service: Internet or ISO Protocol Stack, Revision 1 (9.6 or 14.4 kbps)" },
+    { 4104, 4104, "Packet Data Service: CDPD Protocol Stack, Revision 1 (9.6 or 14.4 kbps)" },
+    { 4105, 32767, "Reserved for standard service options" },
+    { 32768, 32768, "QCELP (13 kbps)" },
+    { 32769, 32771, "Proprietary QUALCOMM Incorporated" },
+    { 32772, 32775, "Proprietary OKI Telecom" },
+    { 32776, 32779, "Proprietary Lucent Technologies" },
+    { 32780, 32783, "Nokia" },
+    { 32784, 32787, "NORTEL NETWORKS" },
+    { 32788, 32791, "Sony Electronics Inc" },
+    { 32792, 32795, "Motorola" },
+    { 32796, 32799, "QUALCOMM Incorporated" },
+    { 32800, 32803, "QUALCOMM Incorporated" },
+    { 32804, 32807, "QUALCOMM Incorporated" },
+    { 32808, 32811, "QUALCOMM Incorporated" },
+    { 32812, 32815, "Lucent Technologies" },
+    { 32816, 32819, "Denso International" },
+    { 32820, 32823, "Motorola" },
+    { 32824, 32827, "Denso International" },
+    { 32828, 32831, "Denso International" },
+    { 32832, 32835, "Denso International" },
     { 32836, 32839, "NEC America" },
     { 32840, 32843, "Samsung Electronics" },
     { 32844, 32847, "Texas Instruments Incorporated" },
@@ -3822,7 +3822,7 @@ static const value_string ansi_map_TDMABandwidth_vals[]  = {
 };
 
 /* 6.5.2.az TDMADataFeaturesIndicator N.S0008-0 v 1.0 */
-/* TDMADataFeaturesIndicator 
+/* TDMADataFeaturesIndicator
    ansi_map_FeatureActivity_vals
 
    ADS FeatureActivity ADS-FA ( octet 1 bit A and B )
@@ -5486,7 +5486,7 @@ dissect_ansi_map_ServiceIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 			}
 		}
 	}
-	 
+
 
 
   return offset;
@@ -6014,7 +6014,7 @@ dissect_ansi_map_CDMA2000HandoffInvokeIOSData(gboolean implicit_tag _U_, tvbuff_
 
 	if (parameter_tvb){
 		subtree = proto_item_add_subtree(actx->created_item, ett_CDMA2000HandoffInvokeIOSData);
-		dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree, 
+		dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree,
 			0, tvb_length_remaining(parameter_tvb,0));
 	}
 
@@ -6622,7 +6622,7 @@ dissect_ansi_map_CDMA2000HandoffResponseIOSData(gboolean implicit_tag _U_, tvbuf
 
 	if (parameter_tvb){
 		subtree = proto_item_add_subtree(actx->created_item, ett_CDMA2000HandoffResponseIOSData);
-		dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree, 
+		dissect_cdma2000_a1_elements(parameter_tvb, actx->pinfo, subtree,
 			0, tvb_length_remaining(parameter_tvb,0));
 	}
 
@@ -15684,7 +15684,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
     case  59: /*Change Service*/
         offset = dissect_ansi_map_ChangeService(TRUE, tvb, offset, actx, tree, hf_ansi_map_changeService);
         break;
-        /* End N.S0008-0 v 1.0 */       
+        /* End N.S0008-0 v 1.0 */
     case  60: /*Parameter Request*/
         offset = dissect_ansi_map_ParameterRequest(TRUE, tvb, offset, actx, tree, hf_ansi_map_parameterRequest);
         break;
@@ -15832,7 +15832,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
         /* CheckMEID X.S0008-0 v1.0*/
     case 104:
         offset = dissect_ansi_map_CheckMEID(TRUE, tvb, offset, actx, tree, hf_ansi_map_checkMEID);
-        break;  
+        break;
         /* PositionEventNotification */
     case 106:
         offset = dissect_ansi_map_PositionEventNotification(TRUE, tvb, offset, actx, tree, hf_ansi_map_positionEventNotification);
@@ -16073,7 +16073,7 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
         /* CheckMEID X.S0008-0 v1.0*/
     case 104:
         offset = dissect_ansi_map_CheckMEIDRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_checkMEIDRes);
-        break;  
+        break;
         /* PositionEventNotification *
            case 106:
            offset = dissect_ansi_map_PositionEventNotification(TRUE, tvb, offset, actx, tree, hf_ansi_map_positionEventNotificationRes);
@@ -16111,15 +16111,15 @@ find_saved_invokedata(asn1_ctx_t *actx){
     char *buf;
 
     buf=ep_alloc(1024);
-    src_str = address_to_str(src);
-    dst_str = address_to_str(dst);
+    src_str = ep_address_to_str(src);
+    dst_str = ep_address_to_str(dst);
 
     /* Data from the TCAP dissector */
     if (actx->pinfo->private_data != NULL){
         p_private_tcap=actx->pinfo->private_data;
         /* The hash string needs to contain src and dest to distiguish differnt flows */
-        src_str = address_to_str(src);
-        dst_str = address_to_str(dst);
+        src_str = ep_address_to_str(src);
+        dst_str = ep_address_to_str(dst);
         /* Reverse order to invoke */
         g_snprintf(buf,1024,"%s%s%s",p_private_tcap->TransactionID_str,dst_str,src_str);
         /*
@@ -16176,9 +16176,9 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     p_private_tcap=pinfo->private_data;
 
     switch(p_private_tcap->d.pdu){
-        /* 
-           1 : invoke, 
-           2 : returnResult, 
+        /*
+           1 : invoke,
+           2 : returnResult,
            3 : returnError,
            4 : reject
         */
@@ -16446,7 +16446,7 @@ void proto_register_ansi_map(void) {
         { &hf_ansi_map_trans_cap_ndss,
           { "NDSS Capability (NDSS)", "ansi_map.trans_cap_ndss",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_ndss_bool_val),0x40,
-            NULL, HFILL }},         
+            NULL, HFILL }},
         { &hf_ansi_map_trans_cap_nami,
           { "NAME Capability Indicator (NAMI)", "ansi_map.trans_cap_nami",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_nami_bool_val),0x80,
@@ -16598,7 +16598,7 @@ void proto_register_ansi_map(void) {
           { "Priority Call Waiting FeatureActivity PCW-FA", "ansi_map.callingfeaturesindicator.pcwfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
             NULL, HFILL }},
-          
+
         { &hf_ansi_map_callingfeaturesindicator_dpfa,
           { "Data Privacy Feature Activity DP-FA", "ansi_map.callingfeaturesindicator.dpfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
@@ -17061,7 +17061,7 @@ void proto_register_ansi_map(void) {
           { "PACA Level", "ansi_map.PACA_Level",
             FT_UINT8, BASE_DEC, VALS(ansi_map_PACA_Level_vals), 0x1e,
             NULL, HFILL }},
-                
+
 
 /*--- Included file: packet-ansi_map-hfarr.c ---*/
 #line 1 "packet-ansi_map-hfarr.c"
@@ -19520,7 +19520,7 @@ void proto_register_ansi_map(void) {
     /* Register fields and subtrees */
     proto_register_field_array(proto_ansi_map, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
- 
+
     register_dissector("ansi_map", dissect_ansi_map, proto_ansi_map);
 
     is637_tele_id_dissector_table =
@@ -19541,7 +19541,7 @@ void proto_register_ansi_map(void) {
     range_convert_str(&global_ssn_range, "5-14", MAX_SSN);
 
     ansi_map_module = prefs_register_protocol(proto_ansi_map, proto_reg_handoff_ansi_map);
-    
+
 
     prefs_register_range_preference(ansi_map_module, "map.ssn", "ANSI MAP SSNs",
                                     "ANSI MAP SSNs to decode as ANSI MAP",
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index dcd5df002a..1ce23b9bda 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -274,8 +274,8 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){
           buf = ep_alloc(MAX_TID_STR_LEN);
           buf[0] = '\0';
           g_snprintf(buf, MAX_TID_STR_LEN, "%s%s%s",
-                ansi_tcap_private.TransactionID_str, address_to_str(src),
-                address_to_str(dst));
+                ansi_tcap_private.TransactionID_str, ep_address_to_str(src),
+                ep_address_to_str(dst));
 
           /* If the entry allready exists don't owervrite it */
           ansi_tcap_saved_invokedata = g_hash_table_lookup(TransactionId_table,buf);
@@ -312,8 +312,8 @@ find_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U
   buf[0] = '\0';
   /* Reverse order to invoke */
   g_snprintf(buf, MAX_TID_STR_LEN, "%s%s%s",
-        ansi_tcap_private.TransactionID_str, address_to_str(dst),
-        address_to_str(src));
+        ansi_tcap_private.TransactionID_str, ep_address_to_str(dst),
+        ep_address_to_str(src));
 
   ansi_tcap_saved_invokedata = g_hash_table_lookup(TransactionId_table, buf);
   if(ansi_tcap_saved_invokedata){
@@ -757,7 +757,7 @@ tvbuff_t	*parameter_tvb;
                                        &parameter_tvb);
   if(!parameter_tvb)
     return offset;
-  
+
   find_tcap_subdissector(parameter_tvb, actx, tree);
 
 
@@ -808,7 +808,7 @@ tvbuff_t	*parameter_tvb;
                                        &parameter_tvb);
   if(!parameter_tvb)
     return offset;
-  
+
   find_tcap_subdissector(parameter_tvb, actx, tree);
 
 
@@ -858,7 +858,7 @@ tvbuff_t	*parameter_tvb;
                                        &parameter_tvb);
   if(!parameter_tvb)
     return offset;
-  
+
   find_tcap_subdissector(parameter_tvb, actx, tree);
 
 
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 7aae624ceb..f193013d5d 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -203,7 +203,7 @@ dtls_init(void)
 {
   ssl_common_init(&dtls_session_hash, &dtls_decrypted_data, &dtls_compressed_data);
   fragment_table_init (&dtls_fragment_table);
-  reassembled_table_init(&dtls_reassembled_table);  
+  reassembled_table_init(&dtls_reassembled_table);
 }
 
 /* parse dtls related preferences (private keys and ports association strings) */
@@ -377,7 +377,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       dummy.port = pinfo->destport;
     }
     ssl_debug_printf("dissect_dtls server %s:%d\n",
-		     address_to_str(&dummy.addr),dummy.port);
+		     ep_address_to_str(&dummy.addr),dummy.port);
 
     /* try to retrive private key for this service. Do it now 'cause pinfo
      * is not always available
@@ -2209,7 +2209,7 @@ proto_register_dtls(void)
     },
     { &hf_dtls_fragment_multiple_tails,
       { "Message has multiple tail fragments",
-	"dtls.fragment.multiple_tails", 
+	"dtls.fragment.multiple_tails",
 	FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_dtls_fragment_too_long_fragment,
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 6700f1ae9e..cbc6641411 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -427,7 +427,7 @@ static void h223_lc_init( void )
 	h223_fw_lc_num = 0;
 }
 
-static void h245_init(void) 
+static void h245_init(void)
 {
 	if ( h245_pending_olc_reqs)
 		g_hash_table_destroy(h245_pending_olc_reqs);
@@ -443,7 +443,7 @@ void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle )
 
 static const gchar *gen_olc_key(guint16 lc_num, address *dst_addr, address *src_addr)
 {
-  return ep_strdup_printf("%s/%s/%u", address_to_str(dst_addr), address_to_str(src_addr), lc_num);
+  return ep_strdup_printf("%s/%s/%u", ep_address_to_str(dst_addr), ep_address_to_str(src_addr), lc_num);
 }
 
 static void update_unicast_addr(unicast_addr_t *req_addr, unicast_addr_t *ack_addr)
@@ -466,8 +466,8 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
 	/* T.38 */
 	if (!strcmp(upcoming_channel->data_type_str, "t38fax")) {
 		if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && t38_handle) {
-			t38_add_address(pinfo, &upcoming_channel->media_addr.addr, 
-							upcoming_channel->media_addr.port, 0, 
+			t38_add_address(pinfo, &upcoming_channel->media_addr.addr,
+							upcoming_channel->media_addr.port, 0,
 							"H245", pinfo->fd->num);
 		}
 		return;
@@ -488,13 +488,13 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha
 	/* DEBUG 	g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel->media_addr.addr.type, upcoming_channel->media_addr.port );
 	*/
 	if (upcoming_channel->media_addr.addr.type!=AT_NONE && upcoming_channel->media_addr.port!=0 && rtp_handle) {
-		srtp_add_address(pinfo, &upcoming_channel->media_addr.addr, 
-						upcoming_channel->media_addr.port, 0, 
+		srtp_add_address(pinfo, &upcoming_channel->media_addr.addr,
+						upcoming_channel->media_addr.port, 0,
 						"H245", pinfo->fd->num, upcoming_channel->is_video , rtp_dyn_payload, dummy_srtp_info);
 	}
 	if (upcoming_channel->media_control_addr.addr.type!=AT_NONE && upcoming_channel->media_control_addr.port!=0 && rtcp_handle) {
-		srtcp_add_address(pinfo, &upcoming_channel->media_control_addr.addr, 
-						upcoming_channel->media_control_addr.port, 0, 
+		srtcp_add_address(pinfo, &upcoming_channel->media_control_addr.addr,
+						upcoming_channel->media_control_addr.port, 0,
 						"H245", pinfo->fd->num, dummy_srtp_info);
 	}
 }
@@ -4067,7 +4067,7 @@ dissect_h245_Application(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
                                  &value);
 
         codec_type = val_to_str(value, h245_Application_vals, "<unknown>");
-		if (h245_pi != NULL) 
+		if (h245_pi != NULL)
 			g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, codec_type);
 
 
@@ -5726,7 +5726,7 @@ dissect_h245_VideoCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
                                  &value);
 
         codec_type = val_to_str(value, h245_VideoCapability_vals, "<unknown>");
-		if (h245_pi != NULL) 
+		if (h245_pi != NULL)
 			g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, codec_type);
 
 
@@ -6623,7 +6623,7 @@ dissect_h245_T_subMessageIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 #line 630 "h245.cnf"
   guint32 subMessageIdentifer;
   gef_ctx_t *gefx;
-  
+
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 127U, &subMessageIdentifer, FALSE);
 
@@ -8454,7 +8454,7 @@ dissect_h245_OLC_reverseLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h245_OLC_reverseLogicalChannelParameters, OLC_reverseLogicalChannelParameters_sequence);
 
-	
+
   if (upcoming_channel && codec_type) {
     g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str));
   }
@@ -8685,8 +8685,8 @@ dissect_h245_OpenLogicalChannel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
     if (fast_start) {
       h245_setup_channels(actx->pinfo, &upcoming_olc->rev_lc);
     } else {
-      g_hash_table_insert(h245_pending_olc_reqs, 
-        se_strdup(gen_olc_key(upcoming_olc->fwd_lc_num, &actx->pinfo->dst, &actx->pinfo->src)), 
+      g_hash_table_insert(h245_pending_olc_reqs,
+        se_strdup(gen_olc_key(upcoming_olc->fwd_lc_num, &actx->pinfo->dst, &actx->pinfo->src)),
         upcoming_olc);
     }
   }
@@ -9264,7 +9264,7 @@ dissect_h245_VideoMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
                                  &value);
 
   codec_type = val_to_str(value, h245_VideoMode_vals, "<unknown>");
-		if (h245_pi != NULL) 
+		if (h245_pi != NULL)
 			g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_VideoMode_vals, "ukn"));
 
 
@@ -9592,7 +9592,7 @@ dissect_h245_AudioMode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
                                  &value);
 
   codec_type = val_to_str(value, h245_AudioMode_vals, "<unknown>");
-		if (h245_pi != NULL) 
+		if (h245_pi != NULL)
 			g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_AudioMode_vals, "ukn"));
 
 
@@ -9661,7 +9661,7 @@ dissect_h245_DataModeApplication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
                                  &value);
 
   codec_type = val_to_str(value, h245_DataModeApplication_vals, "<unknown>");
-		if (h245_pi != NULL) 
+		if (h245_pi != NULL)
 			g_snprintf(h245_pi->frame_label, 50, "%s %s", h245_pi->frame_label, val_to_str(value, h245_DataModeApplication_vals, "ukn"));
 
 
@@ -10996,7 +10996,7 @@ dissect_h245_T_forwardMultiplexAckParameters(tvbuff_t *tvb _U_, int offset _U_,
                                  ett_h245_T_forwardMultiplexAckParameters, T_forwardMultiplexAckParameters_choice,
                                  NULL);
 
-	
+
   upcoming_channel = NULL;
 
 
@@ -11027,14 +11027,14 @@ dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
   h223_fw_lc_num = 0;
   h223_rev_lc_num = 0;
-	
+
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_h245_OpenLogicalChannelAck, OpenLogicalChannelAck_sequence);
 
 
   temp = h223_fw_lc_num;
   p2p_dir = actx->pinfo->p2p_dir;
-  
+
   if(actx->pinfo->p2p_dir == P2P_DIR_SENT)
 	actx->pinfo->p2p_dir = P2P_DIR_RECV;
   else
@@ -14518,7 +14518,7 @@ dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
 
   dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree);
 
-  if (h245_pi != NULL) 
+  if (h245_pi != NULL)
 	  h245_pi->msg_type = H245_OpenLogChn;
 
   if (codec_str && codec_type){
@@ -20698,7 +20698,7 @@ void proto_register_h245(void) {
   oid_add_from_string("ISO/IEC 14496-2 MPEG-4 video","0.0.8.245.1.0.0");
   /* This capability is defined in Annex H. */
   oid_add_from_string("ISO/IEC 14496-3 MPEG-4 audio","0.0.8.245.1.1.0");
-  /* This capability is defined in Annex I. */	
+  /* This capability is defined in Annex I. */
   oid_add_from_string("AMR","0.0.8.245.1.1.1");
   /* This capability is defined in Annex J. */
   oid_add_from_string("acelp","0.0.8.245.1.1.2");
@@ -20720,7 +20720,7 @@ void proto_register_h245(void) {
   oid_add_from_string("AMR-WB","0.0.8.245.1.1.10");
   /* This capability is defined in Annex S. */
   oid_add_from_string("ilbc","0.0.8.245.1.1.11");
-  
+
   oid_add_from_string("ISO/IEC 14496-1","0.0.8.245.1.2.0");
   oid_add_from_string("Nx64","0.0.8.245.1.2.1");
   oid_add_from_string("logical-channel-bit-ratemanagement","0.0.8.245.1.3.0");
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 6495df0152..f9b22d2faf 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -359,7 +359,7 @@ http_reqs_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t*
 
 
 	if (v->request_method) {
-		g_snprintf(ip_str,sizeof(ip_str),"%s",address_to_str(&pinfo->dst));
+		g_snprintf(ip_str,sizeof(ip_str),"%s",ep_address_to_str(&pinfo->dst));
 
 		tick_stat_node(st, st_str_reqs, 0, FALSE);
 		tick_stat_node(st, st_str_reqs_by_srv_addr, st_node_reqs, TRUE);
@@ -376,7 +376,7 @@ http_reqs_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t*
 		return 1;
 
 	} else if (i != 0) {
-		g_snprintf(ip_str,sizeof(ip_str),"%s",address_to_str(&pinfo->src));
+		g_snprintf(ip_str,sizeof(ip_str),"%s",ep_address_to_str(&pinfo->src));
 
 		tick_stat_node(st, st_str_resps_by_srv_addr, 0, FALSE);
 		resps_by_this_addr = tick_stat_node(st, ip_str, st_node_resps_by_srv_addr, TRUE);
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 33efdd5573..7569fdf410 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -17,17 +17,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -194,7 +194,7 @@ static const value_string iax_frame_types[] = {
   {AST_FRAME_IMAGE, "Image"},
   {AST_FRAME_HTML, "HTML"},
   {AST_FRAME_CNG, "Comfort Noise"},
-  {AST_FRAME_MODEM, "Modem"}, 
+  {AST_FRAME_MODEM, "Modem"},
   {AST_FRAME_DTMF_BEGIN, "DTMF Begin"},
   {0,NULL}
 };
@@ -267,7 +267,7 @@ static const voip_call_state tap_cmd_voip_state[] = {
         VOIP_UNKNOWN, /*TKOFFHK*/
         VOIP_UNKNOWN /*OFFHOOK*/
 };
-	
+
 
 /* Subclassess for Modem packets */
 static const value_string iax_modem_subclasses[] = {
@@ -368,7 +368,7 @@ static const value_string iax_packet_types[] = {
   {IAX2_META_PACKET, "Meta packet"},
   {0,NULL}
 };
-  
+
 static const value_string iax_causecodes[] = {
   {AST_CAUSE_UNALLOCATED, "Unallocated"},
   {AST_CAUSE_NO_ROUTE_TRANSIT_NET, "No route transit net"},
@@ -475,12 +475,12 @@ static gchar *key_to_str( const iax_circuit_key *key )
   }
   strp=str[i];
 
-  /* why doesn't address_to_str take a const pointer?
+  /* why doesn't ep_address_to_str take a const pointer?
      cast the warnings into oblivion. */
 
   /* XXX - is this a case for ep_alloc? */
   g_snprintf(strp, 80, "{%s:%i,%i}",
-	  address_to_str((address *)&key->addr),
+	  ep_address_to_str((address *)&key->addr),
 	  key->port,
 	  key->callno);
   return strp;
@@ -519,7 +519,7 @@ static guint iax_circuit_hash (gconstpointer v)
 #ifdef DEBUG_HASHING
   g_debug( "+++ Hashing key: %s, result %#x", key_to_str(key), hash_val );
 #endif
-  
+
   return (guint) hash_val;
 }
 
@@ -639,19 +639,19 @@ static circuit_t *iax2_new_circuit_for_call(guint circuit_id, guint framenum, ia
 					    gboolean reversed)
 {
   circuit_t *res;
-  
+
   if(( reversed && iax_call->n_reverse_circuit_ids >= IAX_MAX_TRANSFERS) ||
      ( !reversed && iax_call->n_forward_circuit_ids >= IAX_MAX_TRANSFERS)) {
     g_warning("Too many transfers for iax_call");
     return NULL;
   }
-  
+
   res = circuit_new(CT_IAX2,
                     circuit_id,
                     framenum );
 
   circuit_add_proto_data(res, proto_iax2, iax_call);
-	
+
   if( reversed )
     iax_call -> reverse_circuit_ids[iax_call->n_reverse_circuit_ids++] = circuit_id;
   else
@@ -698,7 +698,7 @@ static iax_call_data *iax_lookup_call_from_dest( guint src_circuit_id,
   circuit_t *dst_circuit;
   iax_call_data * iax_call;
   gboolean reversed = FALSE;
-  
+
   dst_circuit = find_circuit( CT_IAX2,
 			      dst_circuit_id,
 			      framenum );
@@ -715,7 +715,7 @@ static iax_call_data *iax_lookup_call_from_dest( guint src_circuit_id,
 #ifdef DEBUG_HASHING
   g_debug( "++ found destination circuit" );
 #endif
-      
+
   iax_call = (iax_call_data *)circuit_get_proto_data(dst_circuit,proto_iax2);
 
   /* there's no way we can create a CT_IAX2 circuit without adding
@@ -780,9 +780,9 @@ static iax_call_data *iax_lookup_call_from_dest( guint src_circuit_id,
   return iax_call;
 }
 
-  
+
 /* looks up an iax_call for this packet */
-static iax_call_data *iax_lookup_call( packet_info *pinfo, 
+static iax_call_data *iax_lookup_call( packet_info *pinfo,
                                        guint32 scallno,
                                        guint32 dcallno,
                                        gboolean *reversed_p)
@@ -794,8 +794,8 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo,
 #ifdef DEBUG_HASHING
   g_debug( "++ iax_lookup_circuit_details: Looking up circuit for frame %u, "
 	     "from {%s:%u:%u} to {%s:%u:%u}", pinfo->fd->num,
-	     address_to_str(&pinfo->src),pinfo->srcport,scallno,
-	     address_to_str(&pinfo->dst),pinfo->destport,dcallno);
+	     ep_address_to_str(&pinfo->src),pinfo->srcport,scallno,
+	     ep_address_to_str(&pinfo->dst),pinfo->destport,dcallno);
 #endif
 
 
@@ -859,7 +859,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo,
     g_debug( "++ Call not found. Must have missed the NEW packet?" );
   }
 #endif
-  
+
   return iax_call;
 }
 
@@ -874,20 +874,20 @@ static void init_dir_data(iax_call_dirdata *dirdata)
 /* handles a NEW packet by creating a new iax call and forward circuit.
    the reverse circuit is not created until the ACK is received and
    is created by iax_lookup_circuit_details. */
-static iax_call_data *iax_new_call( packet_info *pinfo, 
+static iax_call_data *iax_new_call( packet_info *pinfo,
                                     guint32 scallno)
 {
   iax_call_data *call;
   guint circuit_id;
   static const nstime_t millisecond = {0, 1000000};
-    
+
 #ifdef DEBUG_HASHING
   g_debug( "+ new_circuit: Handling NEW packet, frame %u", pinfo->fd->num );
 #endif
-  
+
   circuit_id = iax_circuit_lookup(&pinfo->src,pinfo->ptype,
                                   pinfo->srcport,scallno);
-    
+
   call = se_alloc(sizeof(iax_call_data));
   call -> dataformat = 0;
   call -> src_codec = 0;
@@ -907,7 +907,7 @@ static iax_call_data *iax_new_call( packet_info *pinfo,
 
   return call;
 }
-    
+
 
 /* ************************************************************************* */
 
@@ -974,13 +974,13 @@ static guint32 dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
 				proto_tree * main_tree);
 
 
-static guint32 dissect_minipacket (tvbuff_t * tvb, guint32 offset, 
+static guint32 dissect_minipacket (tvbuff_t * tvb, guint32 offset,
 				guint16 scallno,
 				packet_info * pinfo,
 				proto_tree * iax2_tree,
 				proto_tree * main_tree);
 
-static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset, 
+static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset,
 					guint16 scallno,
 					packet_info * pinfo,
 					proto_tree * iax2_tree,
@@ -1067,7 +1067,7 @@ dissect_iax2 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   iax2_info->callingParty = NULL;
   iax2_info->calledParty = NULL;
   iax2_info->payload_data = NULL;
-  
+
   switch( type ) {
     case IAX2_FULL_PACKET:
       len = dissect_fullpacket( tvb, offset, scallno, pinfo, full_mini_subtree, tree );
@@ -1100,7 +1100,7 @@ static proto_item *dissect_datetime_ie(tvbuff_t *tvb, guint32 offset, proto_tree
   struct tm tm;
   guint32 ie_val;
   nstime_t datetime;
-    
+
   proto_tree_add_item (ies_tree, hf_iax2_ies[IAX_IE_DATETIME], tvb, offset + 2, 4, FALSE);
   ie_val = tvb_get_ntohl(tvb, offset+2);
 
@@ -1118,7 +1118,7 @@ static proto_item *dissect_datetime_ie(tvbuff_t *tvb, guint32 offset, proto_tree
   datetime.nsecs = 0;
   return proto_tree_add_time (ies_tree, hf_iax2_ie_datetime, tvb, offset+2, 4, &datetime);
 }
-  
+
 
 /* dissect the information elements in an IAX frame. Returns the updated offset */
 static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
@@ -1126,7 +1126,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
 			    iax2_ie_data *ie_data)
 {
   DISSECTOR_ASSERT(ie_data);
-  
+
   while (offset < tvb_reported_length (tvb)) {
 
     int ies_type = tvb_get_guint8(tvb, offset);
@@ -1139,7 +1139,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
         if (ies_len != 4) THROW(ReportedBoundsError);
         ie_data -> dataformat = tvb_get_ntohl(tvb, offset+2);
         break;
-      
+
       case IAX_IE_CALLED_NUMBER:
         iax2_info->calledParty = g_strdup(tvb_format_text(tvb, offset+2, ies_len));
         break;
@@ -1154,7 +1154,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
            *host* byte order in that structure (the I-D seems to be
            assuming that "everything is a Vax^Wx86 or x86-64" with
            the address family field being little-endian).
-          
+
            This means the address family values are the Linux
            address family values. */
         apparent_addr_family = tvb_get_letohs(tvb, offset+2);
@@ -1177,7 +1177,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
 
 
     /* the rest of this stuff only needs doing if we have an iax_tree */
-    
+
     if( iax_tree ) {
       proto_item *ti, *ie_item = NULL;
       proto_tree *ies_tree;
@@ -1186,7 +1186,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
       ti = proto_tree_add_text(iax_tree, tvb, offset, ies_len+2, " " );
 
       ies_tree = proto_item_add_subtree(ti, ett_iax2_ie);
-      
+
       proto_tree_add_text(ies_tree, tvb, offset, 1, "IE id: %s (0x%02X)",
 			  val_to_str(ies_type, iax_ies_type, "Unknown"),
 			  ies_type);
@@ -1199,13 +1199,13 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
 	 complex decoding, we can just look up an entry from the array, and add
 	 the relevant item.
       */
-	 
+
       switch (ies_type) {
         case IAX_IE_DATETIME:
           ie_item = dissect_datetime_ie(tvb,offset,ies_tree);
           break;
 
-        
+
 	case IAX_IE_CAPABILITY:
 	{
 	  proto_tree *codec_tree;
@@ -1217,7 +1217,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
 				 tvb, offset + 2, ies_len, FALSE);
 	  codec_tree =
 	    proto_item_add_subtree (ie_item, ett_iax2_codecs);
-	      
+
 	  proto_tree_add_item(codec_tree, hf_iax2_cap_g723_1, tvb, offset + 2, ies_len, FALSE );
 	  proto_tree_add_item(codec_tree, hf_iax2_cap_gsm, tvb, offset + 2, ies_len, FALSE );
 	  proto_tree_add_item(codec_tree, hf_iax2_cap_ulaw, tvb, offset + 2, ies_len, FALSE );
@@ -1249,12 +1249,12 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
              *host* byte order in that structure (the I-D seems to be
              assuming that "everything is a Vax^Wx86 or x86-64" with
              the address family field being little-endian).
-            
+
              This means the address family values are the Linux
              address family values. */
 	  apparent_addr_family = tvb_get_letohs(tvb, offset+2);
 	  proto_tree_add_uint(sockaddr_tree, hf_IAX_IE_APPARENTADDR_SINFAMILY, tvb, offset + 2, 2, apparent_addr_family);
-	      
+
 	  switch(  apparent_addr_family ) {
 	    case LINUX_AF_INET:
 	    {
@@ -1267,7 +1267,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
 	  }
 	  break;
 	}
-	      
+
 	default:
 	  if( ie_hf != -1 ) {
             /* throw an error if the IE isn't the expected length */
@@ -1280,7 +1280,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
             guint32 value;
             const guint8 *ptr;
             const gchar *ie_name = val_to_str(ies_type, iax_ies_type, "Unknown");
-	  
+
             switch(ies_len) {
               case 1:
                 value = tvb_get_guint8(tvb, offset + 2);
@@ -1289,7 +1289,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
                                              tvb, offset+2, 1, value,
                                              "%s: %#02x", ie_name, value );
                 break;
-	  
+
               case 2:
                 value = tvb_get_ntohs(tvb, offset + 2);
                 ie_item =
@@ -1297,7 +1297,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
                                              tvb, offset+2, 2, value,
                                              "%s: %#04x", ie_name, value );
                 break;
-	
+
               case 4:
                 value = tvb_get_ntohl(tvb, offset + 2);
                 ie_item =
@@ -1325,7 +1325,7 @@ static guint32 dissect_ies (tvbuff_t * tvb, guint32 offset,
        * item */
       if(!PROTO_ITEM_IS_HIDDEN(ti)) {
 	field_info *ie_finfo = PITEM_FINFO(ie_item);
-	
+
 	/* if the representation of the item has already been set, use that;
 	   else we have to allocate a block to put the text into */
 	if( ie_finfo && ie_finfo->rep != NULL )
@@ -1379,18 +1379,18 @@ static guint32 dissect_iax2_command(tvbuff_t * tvb, guint32 offset,
   ie_data.peer_callno = 0;
   ie_data.dataformat = (guint32)-1;
   iax_call = iax_packet -> call_data;
-  
+
   /* add the subclass */
   proto_tree_add_uint (tree, hf_iax2_iax_csub, tvb, offset, 1, csub);
   offset++;
 
   if (check_col (pinfo->cinfo, COL_INFO))
-    col_append_fstr (pinfo->cinfo, COL_INFO, " %s", 
+    col_append_fstr (pinfo->cinfo, COL_INFO, " %s",
 		     val_to_str (csub, iax_iax_subclasses, "unknown (0x%02x)"));
 
   if (offset >= tvb_reported_length (tvb))
     return offset;
-  
+
   offset += dissect_ies(tvb, offset, tree, &ie_data);
 
   /* if this is a data call, set up a subdissector for the circuit */
@@ -1413,11 +1413,11 @@ static guint32 dissect_iax2_command(tvbuff_t * tvb, guint32 offset,
 		iax_call->reverse_circuit_ids[0],
 		tx_circuit);
 #endif
-      
+
       iax2_new_circuit_for_call(tx_circuit,pinfo->fd->num,iax_call,iax_packet->reversed);
     }
   }
-  
+
   return offset;
 }
 
@@ -1426,7 +1426,7 @@ static void iax2_add_ts_fields(packet_info * pinfo, proto_tree * iax2_tree, iax_
   guint32 longts = shortts;
   nstime_t ts;
   proto_item *item;
-    
+
   if(iax_packet->call_data == NULL) {
     /* no call info for this frame; perhaps we missed the NEW packet */
     return;
@@ -1451,14 +1451,14 @@ static void iax2_add_ts_fields(packet_info * pinfo, proto_tree * iax2_tree, iax_
     }
   }
   iax2_info->timestamp = longts;
-  
+
   if (iax2_tree) {
     item = proto_tree_add_time(iax2_tree, hf_iax2_absts, NULL, 0, 0, &iax_packet->abstime);
     PROTO_ITEM_SET_GENERATED(item);
 
     ts  = pinfo->fd->abs_ts;
     nstime_delta(&ts, &ts, &iax_packet->abstime);
-  
+
     item = proto_tree_add_time(iax2_tree, hf_iax2_lateness, NULL, 0, 0, &ts);
     PROTO_ITEM_SET_GENERATED(item);
   }
@@ -1466,7 +1466,7 @@ static void iax2_add_ts_fields(packet_info * pinfo, proto_tree * iax2_tree, iax_
 
 /* returns the new offset */
 static guint32
-dissect_fullpacket (tvbuff_t * tvb, guint32 offset, 
+dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
 		    guint16 scallno,
 		    packet_info * pinfo, proto_tree * iax2_tree,
 		    proto_tree * main_tree)
@@ -1485,7 +1485,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
   gboolean rtp_marker;
 
   /*
-   * remove the top bit for retransmission detection 
+   * remove the top bit for retransmission detection
    */
   dcallno = tvb_get_ntohs(tvb, offset);
   retransmission = dcallno & 0x8000;
@@ -1520,7 +1520,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
   }
 
   iax2_populate_pinfo_from_packet_data(pinfo, iax_packet);
-  
+
   if( iax2_tree ) {
       proto_item *packet_type_base;
 
@@ -1529,7 +1529,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
       proto_tree_add_item(iax2_tree, hf_iax2_retransmission, tvb, offset, 2, FALSE );
 
       if( iax_call ) {
-        proto_item *item = 
+        proto_item *item =
           proto_tree_add_uint (iax2_tree, hf_iax2_callno, tvb, 0, 4,
                              iax_call->forward_circuit_ids[0] );
         PROTO_ITEM_SET_GENERATED(item);
@@ -1567,7 +1567,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
     iax2_info->messageName = val_to_str (csub, iax_iax_subclasses, "unknown (0x%02x)");
     iax2_info->callState = csub;
     break;
-    
+
   case AST_FRAME_DTMF_BEGIN:
   case AST_FRAME_DTMF_END:
     proto_tree_add_item (packet_type_tree, hf_iax2_dtmf_csub, tvb, offset+9, 1, FALSE);
@@ -1668,7 +1668,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset,
   /* next time we come to parse this packet, don't propogate the codec into the
    * call_data */
   iax_packet->first_time = FALSE;
-  
+
   return offset;
 }
 
@@ -1691,9 +1691,9 @@ static iax_packet_data *iax2_get_packet_data_for_minipacket(packet_info * pinfo,
 
     /* set the codec for this frame to be whatever the last full frame used */
     if( iax_call ) {
-     if( video ) 
+     if( video )
         p->codec = reversed ? iax_call -> dst_vformat : iax_call -> src_vformat;
-      else 
+      else
         p->codec = reversed ? iax_call -> dst_codec : iax_call -> src_codec;
     }
   }
@@ -1722,7 +1722,7 @@ static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset,
 
   if( iax2_tree ) {
     if( iax_packet->call_data ) {
-      item = 
+      item =
         proto_tree_add_uint (iax2_tree, hf_iax2_callno, tvb, 0, 4,
 				    iax_packet->call_data->forward_circuit_ids[0] );
       PROTO_ITEM_SET_GENERATED(item);
@@ -1736,9 +1736,9 @@ static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset,
   }
 
   offset += 2;
-  
+
   if (check_col (pinfo->cinfo, COL_INFO))
-      col_add_fstr (pinfo->cinfo, COL_INFO, 
+      col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Mini video packet, source call# %d, timestamp %ums%s",
 		    scallno, ts, rtp_marker?", Mark":"");
 
@@ -1748,7 +1748,7 @@ static guint32 dissect_minivideopacket (tvbuff_t * tvb, guint32 offset,
   /* next time we come to parse this packet, don't propogate the codec into the
    * call_data */
   iax_packet->first_time = FALSE;
-  
+
   return offset;
 }
 
@@ -1777,11 +1777,11 @@ dissect_minipacket (tvbuff_t * tvb, guint32 offset, guint16 scallno, packet_info
     iax2_add_ts_fields(pinfo, iax2_tree, iax_packet, (guint16)ts);
   }
 
-  
+
   offset += 2;
-  
+
   if (check_col (pinfo->cinfo, COL_INFO))
-      col_add_fstr (pinfo->cinfo, COL_INFO, 
+      col_add_fstr (pinfo->cinfo, COL_INFO,
 		    "Mini packet, source call# %d, timestamp %ums",
 		    scallno, ts);
 
@@ -1793,7 +1793,7 @@ dissect_minipacket (tvbuff_t * tvb, guint32 offset, guint16 scallno, packet_info
   /* next time we come to parse this packet, don't propogate the codec into the
    * call_data */
   iax_packet->first_time = FALSE;
-  
+
   return offset;
 }
 
@@ -1834,7 +1834,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
   gboolean must_desegment = FALSE;
 
   DISSECTOR_ASSERT(iax_call);
-  
+
   pinfo->can_desegment = 2;
   pinfo->desegment_offset = 0;
   pinfo->desegment_len = 0;
@@ -1842,7 +1842,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
 #ifdef DEBUG_DESEGMENT
   g_debug("dissecting packet %u", pinfo->fd->num);
 #endif
-  
+
   dirdata = &(iax_call->dirdata[!!(iax_packet->reversed)]);
 
   if((!pinfo->fd->flags.visited && dirdata->current_frag_bytes > 0) ||
@@ -1882,7 +1882,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
 			    iax_call->fragment_table,
 			    frag_offset,
 			    frag_len, !complete );
-    
+
     if(fd_head && (pinfo->fd->num == fd_head->reassembled_in)) {
       gint32 old_len;
       tvbuff_t *next_tvb = tvb_new_child_real_data(tvb, fd_head->data, fd_head->datalen, fd_head->datalen);
@@ -1938,7 +1938,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
     */
 
     process_iax_pdu(tvb,pinfo,tree,video,iax_packet);
-    
+
     if(pinfo->desegment_len) {
       /* the higher-level dissector has asked for some more data - ie,
          the end of this segment does not coincide with the end of a
@@ -2032,7 +2032,7 @@ static void dissect_payload(tvbuff_t *tvb, guint32 offset,
   if (check_col (pinfo->cinfo, COL_INFO)) {
     if( !video && iax_call && iax_call -> dataformat != 0 ) {
       col_append_fstr (pinfo->cinfo, COL_INFO, ", data, format %s",
-		       val_to_str (iax_call -> dataformat, 
+		       val_to_str (iax_call -> dataformat,
 				   iax_dataformats, "unknown (0x%02x)"));
 #if 0
       if( out_of_order )
@@ -2048,8 +2048,8 @@ static void dissect_payload(tvbuff_t *tvb, guint32 offset,
   proto_tree_add_text( iax2_tree, sub_tvb, 0, -1,
       "IAX2 payload (%u byte%s)", nbytes,
       plurality( nbytes, "", "s" ));
-      
-  iax2_info->payload_len = nbytes;      
+
+  iax2_info->payload_len = nbytes;
   iax2_info->payload_data = tvb_get_ptr(sub_tvb, 0, -1);
 
   /* pass the rest of the block to a subdissector */
@@ -2079,12 +2079,12 @@ void
 proto_register_iax2 (void)
 {
   /* A header field is something you can search/filter on.
-   * 
+   *
    * We create a structure to register our fields. It consists of an
    * array of hf_register_info structures, each of which are of the format
    * {&(field id), {name, abbrev, type, display, strings, bitmask, blurb, HFILL}}.
    */
-   
+
   static hf_register_info hf[] = {
 
     {&hf_iax2_packet_type,
@@ -2144,7 +2144,7 @@ proto_register_iax2 (void)
 
     {&hf_iax2_oseqno,
      {"Outbound seq.no.", "iax2.oseqno", FT_UINT16, BASE_DEC, NULL,
-      0x0, 
+      0x0,
       "oseqno is the sequence no of this packet. The first packet has oseqno==0, and subsequent packets increment the oseqno by 1",
       HFILL}},
 
@@ -2160,7 +2160,7 @@ proto_register_iax2 (void)
       HFILL}},
 
     {&hf_iax2_csub,
-     {"Unknown subclass", "iax2.subclass", FT_UINT8, BASE_DEC, NULL, 0x0, 
+     {"Unknown subclass", "iax2.subclass", FT_UINT8, BASE_DEC, NULL, 0x0,
       "Subclass of unknown type of full IAX2 frame",
       HFILL}},
 
@@ -2171,45 +2171,45 @@ proto_register_iax2 (void)
 
     {&hf_iax2_cmd_csub,
      {"Control subclass", "iax2.control.subclass", FT_UINT8, BASE_DEC,
-      VALS (iax_cmd_subclasses), 0x0, 
+      VALS (iax_cmd_subclasses), 0x0,
       "This gives the command number for a Control packet.", HFILL}},
 
     {&hf_iax2_iax_csub,
      {"IAX subclass", "iax2.iax.subclass", FT_UINT8, BASE_DEC,
       VALS (iax_iax_subclasses),
-      0x0, 
+      0x0,
       "IAX subclass gives the command number for IAX signalling packets", HFILL}},
 
     {&hf_iax2_voice_csub,
-     {"Voice Subclass (compressed codec no)", "iax2.voice.subclass", FT_UINT8, BASE_DEC, NULL, 0x0, 
+     {"Voice Subclass (compressed codec no)", "iax2.voice.subclass", FT_UINT8, BASE_DEC, NULL, 0x0,
       NULL,
       HFILL}},
 
     {&hf_iax2_voice_codec,
      {"CODEC", "iax2.voice.codec", FT_UINT32, BASE_HEX, VALS (codec_types),
-      0x0, 
+      0x0,
       "CODEC gives the codec used to encode audio data", HFILL}},
 
     {&hf_iax2_video_csub,
-     {"Video Subclass (compressed codec no)", "iax2.video.subclass", FT_UINT8, BASE_DEC, NULL, 0xBF, 
+     {"Video Subclass (compressed codec no)", "iax2.video.subclass", FT_UINT8, BASE_DEC, NULL, 0xBF,
       NULL,
       HFILL}},
-    
+
     {&hf_iax2_marker,
      {"Marker", "iax2.video.marker", FT_BOOLEAN, 8, NULL, 0x40,
       "RTP end-of-frame marker",
       HFILL}},
 
     {&hf_iax2_video_codec,
-     {"CODEC", "iax2.video.codec", FT_UINT32, BASE_HEX, VALS (codec_types), 0, 
+     {"CODEC", "iax2.video.codec", FT_UINT32, BASE_HEX, VALS (codec_types), 0,
       "The codec used to encode video data", HFILL}},
 
     {&hf_iax2_modem_csub,
      {"Modem subclass", "iax2.modem.subclass", FT_UINT8, BASE_DEC,
       VALS (iax_modem_subclasses),
-      0x0, 
+      0x0,
       "Modem subclass gives the type of modem", HFILL}},
-    
+
     /*
      * Decoding for the ies
      */
@@ -2220,7 +2220,7 @@ proto_register_iax2 (void)
      {"Port", "iax2.iax.app_addr.sinport", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     {&hf_IAX_IE_APPARENTADDR_SINADDR,
      {"Address", "iax2.iax.app_addr.sinaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
-    
+
     {&hf_iax2_ies[IAX_IE_CALLED_NUMBER],
      {"Number/extension being called", "iax2.iax.called_number",
       FT_STRING,
@@ -2457,7 +2457,7 @@ proto_register_iax2 (void)
 
     {&hf_iax2_cap_gsm,
      {"GSM compression", "iax2.cap.gsm", FT_BOOLEAN, 32,
-       TFS(&tfs_supported_not_supported), AST_FORMAT_GSM, 
+       TFS(&tfs_supported_not_supported), AST_FORMAT_GSM,
       NULL, HFILL }},
 
     {&hf_iax2_cap_ulaw,
@@ -2479,10 +2479,10 @@ proto_register_iax2 (void)
      {"ADPCM", "iax2.cap.adpcm", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_ADPCM,
       NULL, HFILL }},
-    
+
     {&hf_iax2_cap_slinear,
-     {"Raw 16-bit Signed Linear (8000 Hz) PCM", "iax2.cap.slinear", 
-      FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_SLINEAR, 
+     {"Raw 16-bit Signed Linear (8000 Hz) PCM", "iax2.cap.slinear",
+      FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_SLINEAR,
       NULL, HFILL }},
 
     {&hf_iax2_cap_lpc10,
@@ -2589,7 +2589,7 @@ proto_register_iax2 (void)
     "iax2.codec","IAX codec number", FT_UINT32, BASE_HEX);
   iax2_dataformat_dissector_table = register_dissector_table(
     "iax2.dataformat","IAX dataformat number", FT_UINT32, BASE_HEX);
-  
+
   /* register our init routine to be called at the start of a capture,
      to clear out our hash tables etc */
   register_init_routine(&iax_init_protocol);
@@ -2605,7 +2605,7 @@ proto_reg_handoff_iax2 (void)
 }
 
 
-/* 
+/*
  * This sets up the indentation style for this file in emacs.
  *
  * Local Variables:
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 26388faf30..d085b34e4a 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -281,7 +281,7 @@ print_eui64(guint64 addr)
     eui64addr.len = sizeof(guint64);
     eui64addr.data = &addr;
     /* Print the address. */
-    return address_to_str(&eui64addr);
+    return ep_address_to_str(&eui64addr);
 } /* print_eui64 */
 
 /*FUNCTION:------------------------------------------------------
@@ -313,7 +313,7 @@ print_eui64_oui(guint64 addr)
     manuf_name = get_manuf_name_if_known(eui64addr.data);
     if (manuf_name == NULL) {
         /* Could not find an OUI. */
-        return address_to_str(&eui64addr);
+        return ep_address_to_str(&eui64addr);
     }
     else {
         /* Found an address string. */
@@ -1778,7 +1778,7 @@ void proto_register_ieee802154(void)
     proto_register_subtree_array(ett, array_length(ett));
 
     /* add a user preference to set the 802.15.4 ethertype */
-    ieee802154_module = prefs_register_protocol(proto_ieee802154, 
+    ieee802154_module = prefs_register_protocol(proto_ieee802154,
 						proto_reg_handoff_ieee802154);
     prefs_register_uint_preference(ieee802154_module, "802154_ethertype",
 				   "802.15.4 Ethertype (in hex)",
@@ -1826,11 +1826,11 @@ void proto_reg_handoff_ieee802154(void)
 
         prefs_initialized = TRUE;
     } else {
-        dissector_delete("ethertype", old_ieee802154_ethertype, ieee802154_handle);	
+        dissector_delete("ethertype", old_ieee802154_ethertype, ieee802154_handle);
     }
 
     old_ieee802154_ethertype = ieee802154_ethertype;
-	
+
     /* Register dissector handles. */
     dissector_add("ethertype", ieee802154_ethertype, ieee802154_handle);
 
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 142cad82cb..05338ea551 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -295,12 +295,12 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		ipx_tree = proto_item_add_subtree(ti, ett_ipx);
 	}
 
-	str=address_to_str(&pinfo->net_src);
+	str=ep_address_to_str(&pinfo->net_src);
 	hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_src, tvb, 0, 0, str);
 	PROTO_ITEM_SET_HIDDEN(hidden_item);
 	hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_addr, tvb, 0, 0, str);
 	PROTO_ITEM_SET_HIDDEN(hidden_item);
-	str=address_to_str(&pinfo->net_dst);
+	str=ep_address_to_str(&pinfo->net_dst);
 	hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_dst, tvb, 0, 0, str);
 	PROTO_ITEM_SET_HIDDEN(hidden_item);
 	hidden_item = proto_tree_add_string(ipx_tree, hf_ipx_addr, tvb, 0, 0, str);
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index fa2a0c9be6..1d395c0268 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -608,8 +608,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
         }
 
         /* g_message("%d Tpt %s:%d -> %s:%d tvb len=%d\n\t%s %d", pinfo->fd->num,
-                  address_to_str(&pinfo->src), pinfo->srcport,
-                  address_to_str(&pinfo->dst), pinfo->destport,
+                  ep_address_to_str(&pinfo->src), pinfo->srcport,
+                  ep_address_to_str(&pinfo->dst), pinfo->destport,
                   tvb_reported_length_remaining(tvb, 0),
                   content_type ? content_type : "[unknown content type]", (gint) content_length); */
 
@@ -642,14 +642,14 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
             /* Use our source and destination addresses if we have them */
             if (NULL != peer_conversation) {
                 /* g_message("%d Tpt %s:%d -> %s:%d", pinfo->fd->num,
-                          address_to_str(&tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port,
-                          address_to_str(&tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */
+                          ep_address_to_str(&tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port,
+                          ep_address_to_str(&tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */
 
                 if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->initiator_tpt_address)
                     && tpt_conv_data->initiator_tpt_port == pinfo->srcport) {
                     /* g_message("%d From initiator : %s -> %s ", pinfo->fd->num,
-                              address_to_str(&tpt_conv_data->initiator_address),
-                              address_to_str(&tpt_conv_data->receiver_address)); */
+                              ep_address_to_str(&tpt_conv_data->initiator_address),
+                              ep_address_to_str(&tpt_conv_data->receiver_address)); */
                     pinfo->src = tpt_conv_data->initiator_address;
                     pinfo->srcport = 0;
                     pinfo->dst = tpt_conv_data->receiver_address;
@@ -658,8 +658,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                 } else if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->receiver_tpt_address) &&
                            tpt_conv_data->receiver_tpt_port == pinfo->srcport) {
                     /* g_message("%d From receiver : %s -> %s ", pinfo->fd->num,
-                              address_to_str(&tpt_conv_data->receiver_address),
-                              address_to_str(&tpt_conv_data->initiator_address)); */
+                              ep_address_to_str(&tpt_conv_data->receiver_address),
+                              ep_address_to_str(&tpt_conv_data->initiator_address)); */
                     pinfo->src = tpt_conv_data->receiver_address;
                     pinfo->srcport = 0;
                     pinfo->dst = tpt_conv_data->initiator_address;
@@ -667,8 +667,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
                     pinfo->ptype = PT_NONE;
                 } else {
                     /* g_message("%d Nothing matches %s:%d -> %s:%d", pinfo->fd->num,
-                              address_to_str(&pinfo->src), pinfo->srcport,
-                              address_to_str(&pinfo->dst), pinfo->destport); */
+                              ep_address_to_str(&pinfo->src), pinfo->srcport,
+                              ep_address_to_str(&pinfo->dst), pinfo->destport); */
                 }
             }
 
@@ -1306,8 +1306,8 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
         return -needed;
     }
 
-    src_addr = ep_strbuf_new_label(address_to_str(&pinfo->src));
-    dst_addr = ep_strbuf_new_label(address_to_str(&pinfo->dst));
+    src_addr = ep_strbuf_new_label(ep_address_to_str(&pinfo->src));
+    dst_addr = ep_strbuf_new_label(ep_address_to_str(&pinfo->dst));
 
     /* append the port if appropriate */
     if (PT_NONE != pinfo->ptype) {
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index 315690200c..dcc87000d5 100644
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -210,7 +210,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	    pagp_tree = proto_item_add_subtree(pagp_item, ett_pagp);
 	    proto_tree_add_uint(pagp_tree, hf_pagp_version_number, tvb,
 				PAGP_VERSION_NUMBER, 1, raw_octet);
-      } 
+      }
       if (check_col(pinfo->cinfo, COL_INFO)) {
          col_append_str(pinfo->cinfo, COL_INFO,
   	       val_to_str(raw_octet, pdu_vers, "Unknown PDU version"));
@@ -221,7 +221,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
          device_id.data = tvb_get_ptr(tvb, PAGP_FLUSH_LOCAL_DEVICE_ID, 6);
          if (check_col(pinfo->cinfo, COL_INFO)) {
             col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s",
-               address_to_str(&device_id));
+               ep_address_to_str(&device_id));
          }
          if (tree) {
 	       proto_tree_add_ether(pagp_tree, hf_pagp_flush_local_device_id, tvb,
@@ -231,7 +231,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
          device_id.data = tvb_get_ptr(tvb, PAGP_FLUSH_PARTNER_DEVICE_ID, 6);
          if (check_col(pinfo->cinfo, COL_INFO)) {
             col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s",
-               address_to_str(&device_id));
+               ep_address_to_str(&device_id));
          }
          if (tree) {
 	    proto_tree_add_ether(pagp_tree, hf_pagp_flush_partner_device_id, tvb,
@@ -287,7 +287,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       device_id.data = tvb_get_ptr(tvb, PAGP_LOCAL_DEVICE_ID, 6);
       if (check_col(pinfo->cinfo, COL_INFO)) {
          col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s",
-            address_to_str(&device_id));
+            ep_address_to_str(&device_id));
       }
       if (tree) {
 	    proto_tree_add_ether(pagp_tree, hf_pagp_local_device_id, tvb,
@@ -319,7 +319,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       device_id.data = tvb_get_ptr(tvb, PAGP_PARTNER_DEVICE_ID, 6);
       if (check_col(pinfo->cinfo, COL_INFO)) {
          col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s",
-  	       address_to_str(&device_id));
+  	       ep_address_to_str(&device_id));
       }
       if (tree) {
 	    proto_tree_add_ether(pagp_tree, hf_pagp_partner_device_id, tvb,
@@ -369,7 +369,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 		tlv_item = proto_tree_add_text (pagp_tree, tvb, offset, len,
 			   "TLV Entry #%d", i);
-                                                                                
+
 		tlv_tree = proto_item_add_subtree (tlv_item, ett_pagp_tlvs);
 		proto_tree_add_uint_format (tlv_tree, hf_pagp_tlv, tvb,
 			offset,2,tlv,"Type = %d (%s)", tlv,
@@ -381,7 +381,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			               "TLV length too large");
 		   return;
 		}
-                                                                                
+
 		switch (tlv) {
 		   case PAGP_TLV_DEVICE_NAME:
 			ch = tvb_get_ephemeral_string(tvb, offset+4, len-4);
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 738a83a176..a25245a57b 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -155,7 +155,7 @@ static const value_string rtcp_sdes_type_vals[] =
 #define RTCP_XR_VOIP_METRCS 7
 #define RTCP_XR_BT_XNQ      8
 
-static const value_string rtcp_xr_type_vals[] = 
+static const value_string rtcp_xr_type_vals[] =
 {
 	{ RTCP_XR_LOSS_RLE,     "Loss Run Length Encoding Report Block" },
 	{ RTCP_XR_DUP_RLE,      "Duplicate Run Length Encoding Report Block" },
@@ -169,7 +169,7 @@ static const value_string rtcp_xr_type_vals[] =
 };
 
 /* XR VoIP Metrics Block - PLC Algorithms */
-static const value_string rtcp_xr_plc_algo_vals[] = 
+static const value_string rtcp_xr_plc_algo_vals[] =
 {
 	{ 0, "Unspecified" },
 	{ 1, "Disabled" },
@@ -179,7 +179,7 @@ static const value_string rtcp_xr_plc_algo_vals[] =
 };
 
 /* XR VoIP Metrics Block - JB Adaptive */
-static const value_string rtcp_xr_jb_adaptive_vals[] = 
+static const value_string rtcp_xr_jb_adaptive_vals[] =
 {
 	{ 0, "Unknown" },
 	{ 1, "Reserved" },
@@ -189,7 +189,7 @@ static const value_string rtcp_xr_jb_adaptive_vals[] =
 };
 
 /* XR Stats Summary Block - IP TTL or Hop Limit */
-static const value_string rtcp_xr_ip_ttl_vals[] = 
+static const value_string rtcp_xr_ip_ttl_vals[] =
 {
 	{ 0, "No TTL Values" },
 	{ 1, "IPv4" },
@@ -198,10 +198,10 @@ static const value_string rtcp_xr_ip_ttl_vals[] =
 	{ 0, NULL }
 };
 
-/* RTCP Application PoC1 Value strings 
+/* RTCP Application PoC1 Value strings
  * OMA-TS-PoC-UserPlane-V1_0-20060609-A
  */
- 
+
 #define TBCP_BURST_REQUEST                 0
 #define TBCP_BURST_GRANTED                 1
 #define TBCP_BURST_TAKEN_EXPECT_NO_REPLY   2
@@ -535,7 +535,7 @@ void srtcp_add_address( packet_info *pinfo,
 	}
 
 #ifdef DEBUG
-	printf("#%u: %srtcp_add_address(%s, %u, %u, %s, %u\n", pinfo->fd->num, (srtcp_info)?"s":"", address_to_str(addr), port, other_port, setup_method, setup_frame_number);
+	printf("#%u: %srtcp_add_address(%s, %u, %u, %s, %u\n", pinfo->fd->num, (srtcp_info)?"s":"", ep_address_to_str(addr), port, other_port, setup_method, setup_frame_number);
 #endif
 
 	SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
@@ -731,7 +731,7 @@ dissect_rtcp_rtpfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_item
 
     /* Transport-Layer Feedback Message Elements */
     switch (rtcp_rtpfb_fmt) {
-    	case 1: 
+    	case 1:
 			/* NACK */
 			while ((offset - start_offset) < packet_length) {
 				proto_tree_add_item(rtcp_tree, hf_rtcp_rtpfb_nack_pid,
@@ -1079,16 +1079,16 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree
 
 				col_append_fstr(pinfo->cinfo, COL_INFO, " CNAME=\"%s\"",
 				                tvb_get_ephemeral_string(tvb, offset, item_len));
-				
+
 				offset += item_len;
 				packet_len = packet_len - item_len - 1;
-				
+
 				/* In the application dependent data, the TBCP Talk Burst Taken message SHALL carry
 				 * a SSRC field and SDES items, CNAME and MAY carry SDES item NAME to identify the
 				 * PoC Client that has been granted permission to send a Talk Burst.
 				 *
-				 * The SDES item NAME SHALL be included if it is known by the PoC Server. 
-				 * Therefore the length of the packet will vary depending on number of SDES items 
+				 * The SDES item NAME SHALL be included if it is known by the PoC Server.
+				 * Therefore the length of the packet will vary depending on number of SDES items
 				 * and the size of the SDES items.
 				 */
 				if ( packet_len == 0 )
@@ -1269,7 +1269,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree
 					proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_ack_reason_code, tvb, offset, 2, FALSE );
 				}
 
-				/* 16 bits of padding follow */ 
+				/* 16 bits of padding follow */
 				offset += 4;
 				packet_len -= 4;
 				}
@@ -1599,7 +1599,7 @@ static void parse_xr_type_specific_field(tvbuff_t *tvb, gint offset, guint block
     case RTCP_XR_PKT_RXTIMES:
         proto_tree_add_item(tree, hf_rtcp_xr_thinning, tvb, offset, 1, FALSE);
         break;
-        
+
     case RTCP_XR_STATS_SUMRY:
         proto_tree_add_boolean(tree, hf_rtcp_xr_stats_loss_flag, tvb, offset, 1, flags);
         proto_tree_add_boolean(tree, hf_rtcp_xr_stats_dup_flag, tvb, offset, 1, flags);
@@ -1644,23 +1644,23 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
 {
     guint block_num = 1;
     guint temp_value = 0;                          /* used when checking spare bits in block type 8 */
-    
+
     /* Packet length should at least be 4 */
     if (packet_len < 4) {
         proto_tree_add_text(tree, tvb, offset, packet_len, "Missing Sender SSRC");
         return offset + packet_len;
     }
-	
+
     /* SSRC */
     proto_tree_add_item( tree, hf_rtcp_ssrc_sender, tvb, offset, 4, FALSE );
     offset += 4;
     packet_len -= 4;
-    
+
     for(;packet_len > 0; block_num++) {
         guint block_type = tvb_get_guint8(tvb, offset), block_length = 0;
         gint content_length = 0;
         gboolean valid = TRUE;
-        
+
         /* Create a subtree for this block, dont know the length yet*/
         proto_item *block = proto_tree_add_text(tree, tvb, offset, -1, "Block %u", block_num);
         proto_tree *xr_block_tree = proto_item_add_subtree(block, ett_xr_block);
@@ -1668,7 +1668,7 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
         proto_item *content_tree = NULL;
 
         proto_tree_add_item(xr_block_tree, hf_rtcp_xr_block_type, tvb, offset, 1, FALSE);
-        
+
         if (packet_len >= 2) {
             parse_xr_type_specific_field(tvb, offset + 1, block_type, xr_block_tree);
             if (packet_len >= 4) {
@@ -1679,119 +1679,119 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
             proto_tree_add_text(xr_block_tree, tvb, offset + 1, packet_len, "Missing Required Block Headers");
             return offset + packet_len;
         }
-		
+
         content_length = block_length * 4;
         proto_item_set_len(block, content_length + 4);
-        
+
         if (content_length > packet_len) {
             proto_tree_add_text(xr_block_tree, tvb, offset + 2, 2, "Block length is greater than packet length");
         }
-		
+
         offset += 4;
         packet_len -= 4;
 
         contents = proto_tree_add_text(xr_block_tree, tvb, offset, content_length, "Contents");
         content_tree = proto_item_add_subtree(contents, ett_xr_block_contents);
-            
+
         switch (block_type) {
         case RTCP_XR_VOIP_METRCS: {
             guint fraction_rate;
-            
+
             /* Identifier */
             proto_tree_add_item(content_tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE);
             offset += 4;
-            
+
             /* Loss Rate */
             fraction_rate = tvb_get_guint8(tvb, offset);
-            proto_tree_add_uint_format(content_tree, hf_rtcp_ssrc_fraction, tvb, offset, 1, 
+            proto_tree_add_uint_format(content_tree, hf_rtcp_ssrc_fraction, tvb, offset, 1,
                                        fraction_rate, "Fraction lost: %u / 256", fraction_rate);
             offset++;
-            
+
             /* Discard Rate */
             fraction_rate = tvb_get_guint8(tvb, offset);
-            proto_tree_add_uint_format(content_tree, hf_rtcp_ssrc_discarded, tvb, offset, 1, 
+            proto_tree_add_uint_format(content_tree, hf_rtcp_ssrc_discarded, tvb, offset, 1,
                                        fraction_rate, "Fraction Discarded: %u / 256", fraction_rate);
             offset++;
-            
+
             /* Burst Density */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_burst_density, tvb, offset, 1, FALSE);
             offset++;
-            
+
             /* Gap Density */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_gap_density, tvb, offset, 1, FALSE);
             offset++;
-            
+
             /* Burst Duration */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_burst_duration, tvb, offset, 2, FALSE);
             offset += 2;
-            
+
             /* Gap Duration */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_gap_duration, tvb, offset, 2, FALSE);
             offset += 2;
-            
+
             /* Round Trip Delay */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_rtdelay, tvb, offset, 2, FALSE);
             offset += 2;
-            
+
             /* End System Delay */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_esdelay, tvb, offset, 2, FALSE);
             offset += 2;
-            
+
             /* Signal Level */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_siglevel, tvb, offset, 1, FALSE);
             offset++;
-            
+
             /* Noise Level */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_noiselevel, tvb, offset, 1, FALSE);
             offset++;
-            
+
             /* RERL */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_rerl, tvb, offset, 1, FALSE);
             offset++;
-            
+
             /* GMin */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_gmin, tvb, offset, 1, FALSE);
             offset++;
-            
+
             /* R factor */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_rfactor, tvb, offset, 1, FALSE);
             offset++;
-            
+
             /* external R Factor */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_extrfactor, tvb, offset, 1, FALSE);
             offset++;
-            
+
             /* MOS LQ */
-            proto_tree_add_float(content_tree, hf_rtcp_xr_voip_metrics_moslq, tvb, offset, 1, 
+            proto_tree_add_float(content_tree, hf_rtcp_xr_voip_metrics_moslq, tvb, offset, 1,
                                  (float) (tvb_get_guint8(tvb, offset) / 10.0));
             offset++;
-            
+
             /* MOS CQ */
-            proto_tree_add_float(content_tree, hf_rtcp_xr_voip_metrics_moscq, tvb, offset, 1, 
+            proto_tree_add_float(content_tree, hf_rtcp_xr_voip_metrics_moscq, tvb, offset, 1,
                                  (float) (tvb_get_guint8(tvb, offset) / 10.0));
             offset++;
-            
+
             /* PLC, JB Adaptive, JB Rate */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_plc, tvb, offset, 1, FALSE);
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_jbadaptive, tvb, offset, 1, FALSE);
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_jbrate, tvb, offset, 1, FALSE);
             offset += 2; /* skip over reseved bit */
-            
+
             /* JB Nominal */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_jbnominal, tvb, offset, 2, FALSE);
             offset += 2;
-            
+
             /* JB Max */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_jbmax, tvb, offset, 2, FALSE);
             offset += 2;
-            
+
             /* JB Abs max */
             proto_tree_add_item(content_tree, hf_rtcp_xr_voip_metrics_jbabsmax, tvb, offset, 2, FALSE);
             offset += 2;
 
             break;
         }
-            
+
         case RTCP_XR_STATS_SUMRY: {
             /* Identifier */
             proto_tree_add_item(content_tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE);
@@ -1857,7 +1857,7 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
             ts_lsw = tvb_get_ntohl(tvb, offset);
             proto_tree_add_text(content_tree, tvb, offset, 4, "Timestamp, LSW: %u", ts_lsw);
             offset += 4;
-            
+
             break;
         }
 
@@ -1869,20 +1869,20 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
                 /* Create a new subtree for a length of 12 bytes */
                 proto_tree *ti = proto_tree_add_text(content_tree, tvb, offset, 12, "Source %u", counter + 1);
                 proto_tree *ssrc_tree = proto_item_add_subtree(ti, ett_xr_ssrc);
-                
+
                 /* SSRC_n source identifier, 32 bits */
                 proto_tree_add_item(ssrc_tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE);
                 offset += 4;
-                
+
                 /* Last RR timestamp */
                 proto_tree_add_item(ssrc_tree, hf_rtcp_xr_lrr, tvb, offset, 4, FALSE);
                 offset += 4;
-                
+
                 /* Delay since last RR timestamp */
                 proto_tree_add_item(ssrc_tree, hf_rtcp_xr_dlrr, tvb, offset, 4, FALSE);
                 offset += 4;
             }
-            
+
             if (content_length % 12 != 0)
                 offset += content_length % 12;
             break;
@@ -1906,8 +1906,8 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
             proto_tree_add_item(content_tree, hf_rtcp_xr_endseq, tvb, offset, 2, FALSE);
             offset += 2;
 
-            for(count = 0; skip < content_length; skip += 4, count++) { 
-                proto_tree_add_text(content_tree, tvb, offset, 4, "Seq: %u, Timestamp: %u", 
+            for(count = 0; skip < content_length; skip += 4, count++) {
+                proto_tree_add_text(content_tree, tvb, offset, 4, "Seq: %u, Timestamp: %u",
                                     (begin + count) % 65536, FALSE);
                 offset += 4;
             }
@@ -1921,7 +1921,7 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
             guint16 begin = 0;
             proto_item *chunks_item;
             proto_tree *chunks_tree;
-            
+
             /* Identifier */
             proto_tree_add_item(content_tree, hf_rtcp_ssrc_source, tvb, offset, 4, FALSE);
             offset += 4;
@@ -1941,7 +1941,7 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
 
             for(count = 1; skip < content_length; skip += 2, count++) {
                 guint value = tvb_get_ntohs(tvb, offset);
-                
+
                 if (value == 0) {
                     proto_tree_add_text(chunks_tree, tvb, offset, 2,
                                         "Chunk: %u -- Null Terminator ",
@@ -1961,7 +1961,7 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree *t
                 }
                 offset += 2;
             }
-            
+
             break;
         }
         case RTCP_XR_BT_XNQ: {										/* BT XNQ block as defined in RFC5093 */
@@ -2027,7 +2027,7 @@ dissect_rtcp_rr( packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree
 	proto_tree *high_sec_tree = (proto_tree*) NULL;
 	proto_item *ti = (proto_item*) NULL;
 	guint8 rr_flt;
-	int rr_offset = offset; 
+	int rr_offset = offset;
 
 	while ( counter <= count ) {
 		guint32 lsr, dlsr;
@@ -2495,7 +2495,7 @@ static void add_roundtrip_delay_info(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 	/* Report delay in INFO column */
 	col_append_fstr(pinfo->cinfo, COL_INFO,
 	                " (roundtrip delay <-> %s = %dms, using frame %u)  ",
-	                address_to_str(&pinfo->net_src), delay, frame);
+	                ep_address_to_str(&pinfo->net_src), delay, frame);
 }
 
 static int
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index b911e619b1..851b592fa9 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -304,7 +304,7 @@ const value_string rtp_payload_type_vals[] =
 	{ PT_MPV,	"MPEG-I/II Video"},
 	{ PT_MP2T,	"MPEG-II transport streams"},
 	{ PT_H263,	"ITU-T H.263" },
- 
+
  	/* Alex Lindberg - Added to support addtional RTP payload types
  	See epan/rtp_pt.h */
 	{ PT_UNDF_96,	"DynamicRTP-Type-96" },
@@ -339,7 +339,7 @@ const value_string rtp_payload_type_vals[] =
 	{ PT_UNDF_125,	"DynamicRTP-Type-125" },
 	{ PT_UNDF_126,	"DynamicRTP-Type-126" },
 	{ PT_UNDF_127,	"DynamicRTP-Type-127" },
- 
+
 	{ 0,		NULL },
 };
 
@@ -372,7 +372,7 @@ const value_string rtp_payload_type_short_vals[] =
 	{ PT_MPV,       "MPEG-I/II Video"},
 	{ PT_MP2T,      "MPEG-II streams"},
 	{ PT_H263,      "h263" },
- 
+
  	/* Alex Lindberg - Short RTP types */
 	{ PT_UNDF_96,	"RTPType-96" },
 	{ PT_UNDF_97,	"RTPType-97" },
@@ -463,7 +463,7 @@ void srtp_add_address(packet_info *pinfo,
 	}
 
 #ifdef DEBUG
-	printf("#%u: %srtp_add_address(%s, %u, %u, %s, %u\n", pinfo->fd->num, (srtp_info)?"s":"", address_to_str(addr), port, other_port, setup_method, setup_frame_number);
+	printf("#%u: %srtp_add_address(%s, %u, %u, %s, %u\n", pinfo->fd->num, (srtp_info)?"s":"", ep_address_to_str(addr), port, other_port, setup_method, setup_frame_number);
 #endif
 
 	SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
@@ -560,14 +560,14 @@ dissect_rtp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
 			switch (global_rtp_version0_type) {
 			case RTP0_STUN:
 				return call_dissector_only(stun_heur_handle, tvb, pinfo, tree);
-				
+
 			case RTP0_T38:
 				/* XXX: Should really be calling a heuristic dissector for T38 ??? */
 				call_dissector_only(t38_handle, tvb, pinfo, tree);
 				return TRUE;
-				
+
 			case RTP0_INVALID:
-				
+
 			default:
 				return FALSE; /* Unknown or unsupported version */
 			}
@@ -946,8 +946,8 @@ dissect_rtp_rfc2198(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
 		    offset, 1, octet1, "Payload type: %s (%u)",
 			payload_type_str ? payload_type_str : val_to_str(hdr_new->pt, rtp_payload_type_vals, "Unknown"),
 			hdr_new->pt);
-		proto_item_append_text(ti, ": PT=%s", 
-				       payload_type_str ? payload_type_str : 
+		proto_item_append_text(ti, ": PT=%s",
+				       payload_type_str ? payload_type_str :
 				                          val_to_str(hdr_new->pt, rtp_payload_type_vals, "Unknown (%u)"));
 		offset += 1;
 
@@ -1152,7 +1152,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
 	/* check if this is added as an SRTP stream - if so, don't try to dissector the payload data for now */
 	p_conv_data = p_get_proto_data(pinfo->fd, proto_rtp);
 
-		
+
 	if (p_conv_data && p_conv_data->srtp_info) {
 		srtp_info = p_conv_data->srtp_info;
 		if (rtp_info->info_all_data_present) {
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index 0632d5bcb7..7f999295b1 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -827,8 +827,8 @@ sccp_assoc_info_t* get_sccp_assoc(packet_info* pinfo, guint offset, guint32 src_
     if(assoc)
         return assoc;
 
-    opck = opc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)opc->data) : g_str_hash(address_to_str(opc));
-    dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)dpc->data) : g_str_hash(address_to_str(dpc));
+    opck = opc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)opc->data) : g_str_hash(ep_address_to_str(opc));
+    dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)dpc->data) : g_str_hash(ep_address_to_str(dpc));
 
 
     switch (msg_type) {
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 0d670f7f7f..599045def0 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -669,7 +669,7 @@ const value_string ssl_31_ciphersuite[] = {
     { 0xC036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA" },
     { 0xC037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256" },
     { 0xC038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384" },
-    { 0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA" }, 	
+    { 0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA" },
     { 0xC03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256" },
     { 0xC03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384" },
 
@@ -2514,7 +2514,7 @@ ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree
       dummy.port = port = pinfo->destport;
   }
   ssl_debug_printf("ssl_find_private_key server %s:%u\n",
-      address_to_str(&dummy.addr),dummy.port);
+      ep_address_to_str(&dummy.addr),dummy.port);
 
   /* try to retrieve private key for this service. Do it now 'cause pinfo
    * is not always available
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index 23405cd175..c49e585e38 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -788,11 +788,11 @@ tacplus_print_key_entry( gpointer data, gpointer user_data )
 {
 	tacplus_key_entry *tacplus_data=(tacplus_key_entry *)data;
 	if( user_data ) {
-		printf("%s:%s=%s\n", address_to_str( tacplus_data->s ),
-				address_to_str( tacplus_data->c ), tacplus_data->k );
+		printf("%s:%s=%s\n", ep_address_to_str( tacplus_data->s ),
+				ep_address_to_str( tacplus_data->c ), tacplus_data->k );
 	} else {
-		printf("%s:%s\n", address_to_str( tacplus_data->s ),
-				address_to_str( tacplus_data->c ) );
+		printf("%s:%s\n", ep_address_to_str( tacplus_data->s ),
+				ep_address_to_str( tacplus_data->c ) );
 	}
 }
 #endif
@@ -924,14 +924,14 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	const char	*key=NULL;
 
 	len = tvb_get_ntohl(tvb, 8);
-	
+
 	if(len > (guint)tvb_length_remaining(tvb, 12) &&
 	   pinfo->can_desegment && tacplus_preference_desegment) {
 		pinfo->desegment_offset = 0;
 		pinfo->desegment_len = len;
 		return;
 	}
-	
+
 	if( request ) {
 		key=find_key( &pinfo->dst, &pinfo->src );
 	} else {
diff --git a/epan/gcp.c b/epan/gcp.c
index 7b62b7ab5a..c044b54dcb 100644
--- a/epan/gcp.c
+++ b/epan/gcp.c
@@ -75,7 +75,7 @@ void gcp_init(void) {
 
   if (gcp_initialized)
     return;
-	  
+
   msgs = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "gcp_msgs");
   trxs = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "gcp_trxs");
   ctxs_by_trx = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "gcp_ctxs_by_trx");
@@ -142,8 +142,8 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) {
 			break;
 		default:
 			/* XXX: heuristic and error prone */
-			m->hi_addr = g_str_hash(address_to_str(hi_addr));
-			m->lo_addr = g_str_hash(address_to_str(lo_addr));
+			m->hi_addr = g_str_hash(ep_address_to_str(hi_addr));
+			m->lo_addr = g_str_hash(ep_address_to_str(lo_addr));
 			break;
 	}
 
@@ -228,11 +228,11 @@ gcp_trx_t* gcp_trx(gcp_msg_t* m ,guint32 t_id , gcp_trx_type_t type, gboolean ke
 gcp_ctx_t* gcp_ctx(gcp_msg_t* m, gcp_trx_t* t, guint32 c_id, gboolean persistent) {
     gcp_ctx_t* context = NULL;
     gcp_ctx_t** context_p = NULL;
-	
+
     if ( !m || !t ) return NULL;
-		
+
     if (persistent) {
-		
+
 		emem_tree_key_t ctx_key[] = {
 		{1,&(m->hi_addr)},
 		{1,&(m->lo_addr)},
@@ -271,7 +271,7 @@ gcp_ctx_t* gcp_ctx(gcp_msg_t* m, gcp_trx_t* t, guint32 c_id, gboolean persistent
                     context->terms.last = &(context->terms);
                     context->terms.next = NULL;
                     context->terms.term = NULL;
-					
+
                     se_tree_insert32_array(ctxs_by_trx,trx_key,context);
                 }
             } else {
@@ -388,7 +388,7 @@ gcp_cmd_t* gcp_cmd(gcp_msg_t* m, gcp_trx_t* t, gcp_ctx_t* c, gcp_cmd_type_t type
         c->cmds = cmdctx;
         c->cmds->last = cmdctx;
     }
-	
+
     return cmd;
 }
 
@@ -594,7 +594,7 @@ gchar* gcp_cmd_to_str(gcp_cmd_t* c, gboolean persistent) {
         case GCP_CMD_OTHER_REQ:
             s = "Request {";
             break;
-			
+
     }
 
     for (term = c->terms.next; term; term = term->next) {
diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index 7f9925a946..b34eaf980e 100644
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -12,7 +12,7 @@ EXPORTS
 abs_time_secs_to_str
 abs_time_to_str
 add_new_data_source
-address_to_str
+ep_address_to_str
 address_to_str_buf
 AdmissionRejectReason_vals      DATA
 airpdcap_ctx                    DATA
@@ -544,8 +544,8 @@ h225_RasMessage_vals                 DATA
 h225_ReleaseCompleteReason_vals      DATA
 h245_set_h223_add_lc_handle
 h245_set_h223_set_mc_handle
-h248_param_ber_integer 
-h248_register_package 
+h248_param_ber_integer
+h248_register_package
 have_custom_cols
 have_filtering_tap_listeners
 have_tap_listeners
diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c
index 81db9e2d27..39c9e8d9e2 100644
--- a/epan/tcap-persistentdata.c
+++ b/epan/tcap-persistentdata.c
@@ -1051,8 +1051,8 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data);
   } else {
     /* Don't have MTP3 PCs (maybe we're over SUA?) */
-    tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(&pinfo->src));
-    tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(&pinfo->dst));
+    tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src));
+    tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst));
   }
   tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key);
 
@@ -1060,7 +1060,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 #ifdef DEBUG_TCAPSRT
   dbg(10,"\n Hbegin #%u ", pinfo->fd->num);
   dbg(11,"key %lx ",tcaphash_begin_key.hashKey);
-  dbg(51,"PC %s %s ",address_to_str(&pinfo->src), address_to_str(&pinfo->dst));
+  dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst));
   dbg(51,"Tid %lx ",tcaphash_begin_key.tid);
 #endif
 
@@ -1250,14 +1250,14 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     tcaphash_cont_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data);
   } else {
     /* Don't have MTP3 PCs (maybe we're over SUA?) */
-    tcaphash_cont_key.opc_hash = g_str_hash(address_to_str(&pinfo->src));
-    tcaphash_cont_key.dpc_hash = g_str_hash(address_to_str(&pinfo->dst));
+    tcaphash_cont_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src));
+    tcaphash_cont_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst));
   }
   tcaphash_cont_key.hashKey=tcaphash_cont_calchash(&tcaphash_cont_key);
 
 #ifdef DEBUG_TCAPSRT
   dbg(11,"Ckey %lx ", tcaphash_cont_key.hashKey);
-  dbg(51,"PC %s %s ",address_to_str(&pinfo->src), address_to_str(&pinfo->dst));
+  dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst));
   dbg(51,"Tid %lx %lx ",tcaphash_cont_key.src_tid, tcaphash_cont_key.dst_tid);
 #endif
   p_tcaphash_contcall = find_tcaphash_cont(&tcaphash_cont_key, pinfo);
@@ -1279,14 +1279,14 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data);
     } else {
       /* Don't have MTP3 PCs (maybe we're over SUA?) */
-      tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(&pinfo->src));
-      tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(&pinfo->dst));
+      tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src));
+      tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst));
     }
     tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key);
 
 #ifdef DEBUG_TCAPSRT
     dbg(11,"Bkey %lx ", tcaphash_begin_key.hashKey);
-    dbg(51,"PC %s %s ",address_to_str(&pinfo->src), address_to_str(&pinfo->dst));
+    dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst));
     dbg(51,"Tid %lx ",tcaphash_begin_key.tid);
 #endif
     p_tcaphash_begincall = find_tcaphash_begin(&tcaphash_begin_key, pinfo,FALSE);
@@ -1313,8 +1313,8 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	tcaphash_end_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data);
       } else {
 	/* Don't have MTP3 PCs (maybe we're over SUA?) */
-	tcaphash_end_key.opc_hash = g_str_hash(address_to_str(&pinfo->src));
-	tcaphash_end_key.dpc_hash = g_str_hash(address_to_str(&pinfo->dst));
+	tcaphash_end_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src));
+	tcaphash_end_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst));
       }
       tcaphash_end_key.hashKey=tcaphash_end_calchash(&tcaphash_end_key);
 
@@ -1384,14 +1384,14 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     tcaphash_end_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data);
   } else {
     /* Don't have MTP3 PCs (maybe we're over SUA?) */
-    tcaphash_end_key.opc_hash = g_str_hash(address_to_str(&pinfo->src));
-    tcaphash_end_key.dpc_hash = g_str_hash(address_to_str(&pinfo->dst));
+    tcaphash_end_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src));
+    tcaphash_end_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst));
   }
   tcaphash_end_key.hashKey=tcaphash_end_calchash(&tcaphash_end_key);
 
 #ifdef DEBUG_TCAPSRT
   dbg(11,"Ekey %lx ",tcaphash_end_key.hashKey);
-  dbg(11,"PC %s %s ",address_to_str(&pinfo->src), address_to_str(&pinfo->dst));
+  dbg(11,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst));
   dbg(51,"Tid %lx ",tcaphash_end_key.tid);
 #endif
   p_tcaphash_endcall = find_tcaphash_end(&tcaphash_end_key, pinfo,TRUE);
@@ -1408,14 +1408,14 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data);
     } else {
       /* Don't have MTP3 PCs (maybe we're over SUA?) */
-      tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(&pinfo->src));
-      tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(&pinfo->dst));
+      tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src));
+      tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst));
     }
     tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key);
 
 #ifdef DEBUG_TCAPSRT
     dbg(11,"Bkey %lx ", tcaphash_begin_key.hashKey);
-    dbg(51,"PC %s %s ",address_to_str(&pinfo->src), address_to_str(&pinfo->dst));
+    dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst));
     dbg(51,"Tid %lx ",tcaphash_begin_key.tid);
 #endif
     p_tcaphash_begincall = find_tcaphash_begin(&tcaphash_begin_key, pinfo,FALSE);
@@ -1507,8 +1507,8 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     tcaphash_ansi_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data);
   } else {
     /* Don't have MTP3 PCs (maybe we're over SUA?) */
-    tcaphash_ansi_key.opc_hash = g_str_hash(address_to_str(&pinfo->src));
-    tcaphash_ansi_key.dpc_hash = g_str_hash(address_to_str(&pinfo->dst));
+    tcaphash_ansi_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src));
+    tcaphash_ansi_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst));
   }
   tcaphash_ansi_key.hashKey=tcaphash_ansi_calchash(&tcaphash_ansi_key);
 
@@ -1516,7 +1516,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 #ifdef DEBUG_TCAPSRT
   dbg(10,"\n Hansi #%u ", pinfo->fd->num);
   dbg(11,"key %lx ",tcaphash_ansi_key.hashKey);
-  dbg(51,"PC %s %s ",address_to_str(&pinfo->src), address_to_str(&pinfo->dst));
+  dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst));
   dbg(51,"Tid %lx ",tcaphash_ansi_key.tid);
 #endif
   p_tcaphash_ansicall = (struct tcaphash_ansicall_t *)
diff --git a/epan/to_str.c b/epan/to_str.c
index 3769fb121e..2f69c34927 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -127,7 +127,7 @@ bytestring_to_str(const guint8 *ad, guint32 len, char punct) {
  * for a string using a colon as the hex-digit separator.
  */
 /* XXX FIXME
-remove this one later when every call has been converted to address_to_str()
+remove this one later when every call has been converted to ep_address_to_str()
 */
 gchar *
 ether_to_str(const guint8 *ad)
@@ -137,7 +137,7 @@ ether_to_str(const guint8 *ad)
 
 /*
  This function is very fast and this function is called a lot.
- XXX update the address_to_str stuff to use this function.
+ XXX update the ep_address_to_str stuff to use this function.
 */
 const gchar *
 ip_to_str(const guint8 *ad) {
@@ -150,7 +150,7 @@ ip_to_str(const guint8 *ad) {
 
 /*
  This function is very fast and this function is called a lot.
- XXX update the address_to_str stuff to use this function.
+ XXX update the ep_address_to_str stuff to use this function.
 */
 static const char * const fast_strings[] = {
 "0", "1", "2", "3", "4", "5", "6", "7",
@@ -228,7 +228,7 @@ ip_to_str_buf(const guint8 *ad, gchar *buf, int buf_len)
 
 
 /* XXX FIXME
-remove this one later when every call has been converted to address_to_str()
+remove this one later when every call has been converted to ep_address_to_str()
 */
 gchar *
 ip6_to_str(const struct e_in6_addr *ad) {
@@ -739,7 +739,7 @@ rel_time_to_secs_str(nstime_t *rel_time)
 
 
 /* XXX FIXME
-remove this one later when every call has been converted to address_to_str()
+remove this one later when every call has been converted to ep_address_to_str()
 */
 gchar *
 fc_to_str(const guint8 *ad)
@@ -956,7 +956,7 @@ decode_numeric_bitfield(guint32 val, guint32 mask, int width,
 /* convert an address struct into a printable string */
 
 gchar*
-address_to_str(const address *addr)
+ep_address_to_str(const address *addr)
 {
   gchar *str;
 
@@ -965,13 +965,13 @@ address_to_str(const address *addr)
   return str;
 }
 
-/* The called routines use ep_alloc:ed memory */
+/* The called routines use se_alloc'ed memory */
 gchar*
 se_address_to_str(const address *addr)
 {
   gchar *str;
 
-  str = address_to_str(addr);
+  str = ep_address_to_str(addr);
   return se_strdup(str);
 }
 
diff --git a/epan/to_str.h b/epan/to_str.h
index 29f9d4b6b7..69d02a357c 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -53,7 +53,9 @@ typedef enum {
 
 struct     e_in6_addr;
 
-extern gchar*	address_to_str(const address *);
+/* !!Deprecated!! - use ep_address_to_str() */
+#define address_to_str ep_address_to_str
+extern gchar*	ep_address_to_str(const address *);
 extern gchar*	se_address_to_str(const address *);
 extern void     address_to_str_buf(const address *addr, gchar *buf, int buf_len);
 extern gchar*   bytestring_to_str(const guint8 *, guint32, char);
diff --git a/gtk/compare_stat.c b/gtk/compare_stat.c
index b47cbd51cd..5ef9340e16 100644
--- a/gtk/compare_stat.c
+++ b/gtk/compare_stat.c
@@ -354,7 +354,7 @@ call_foreach_new_order(gpointer value, gpointer arg)
 				fInfo->zebra_time=cs->zebra_time;
 				cs->zebra_time.nsecs=cs->zebra_time.nsecs++;
 			}
-			
+
 		}
 	} else {
 		if(TTL_method==FALSE){
@@ -369,9 +369,9 @@ call_foreach_new_order(gpointer value, gpointer arg)
 			} else {
 				fInfo->zebra_time.nsecs=fInfoTemp->zebra_time.nsecs+1;
 			}
-		}	
+		}
 	}
-	
+
 	/* count packets of file */
 	if(fmod(fInfo->zebra_time.nsecs, MERGED_FILES)){
 		cs->first_file_amount++;
@@ -485,12 +485,12 @@ call_foreach_print_ip_tree(gpointer value, gpointer user_data)
 	if(show_it){
 		if((fInfo->fg->count<MERGED_FILES)){
 			gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, NULL);
-			gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "Packet lost", COUNT, fInfo->fg->count, DELTA, 0.0, -1); 
+			gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "Packet lost", COUNT, fInfo->fg->count, DELTA, 0.0, -1);
 		}
-			
+
 		if(fInfo->fg->count > MERGED_FILES){
 			gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, NULL);
-			gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "More than two packets", COUNT, fInfo->fg->count, DELTA, 0.0, -1); 
+			gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "More than two packets", COUNT, fInfo->fg->count, DELTA, 0.0, -1);
 			if(fInfo->fg->cksum == WRONG_CHKSUM) {
 				gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, &cs->iter);
 				gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Checksum error over IP header", COUNT, fInfo->fg->count, DELTA, 0.0, -1);
@@ -506,14 +506,14 @@ call_foreach_print_ip_tree(gpointer value, gpointer user_data)
 				}
 				if((nstime_cmp(&fInfo->fg->predecessor_time, &fInfo->zebra_time)>0||nstime_cmp(&fInfo->fg->partner->fg->predecessor_time, &fInfo->fg->partner->zebra_time)>0) && (fInfo->zebra_time.nsecs!=MERGED_FILES) && ON_method){
 					gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, &cs->iter);
-					gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Not correct order", COUNT, fInfo->fg->count, DELTA, delta, -1); 
+					gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Not correct order", COUNT, fInfo->fg->count, DELTA, delta, -1);
 				}
 			} else if(((delta < (average-cs->stats.variance)) || (delta > (average+cs->stats.variance))) && (delta > 0.0) && (cs->stats.variance!=0)) {
 				gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, NULL);
 				gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "Not arrived in time", COUNT, fInfo->fg->count, DELTA, delta, -1);
 				if((nstime_cmp(&fInfo->fg->predecessor_time, &fInfo->zebra_time)>0||nstime_cmp(&fInfo->fg->partner->fg->predecessor_time, &fInfo->fg->partner->zebra_time)>0) && fInfo->zebra_time.nsecs != MERGED_FILES && ON_method){
 					gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, &cs->iter);
-					gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Not correct order", COUNT, fInfo->fg->count, DELTA, delta, -1); 
+					gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Not correct order", COUNT, fInfo->fg->count, DELTA, delta, -1);
 				}
 			} else if((nstime_cmp(&fInfo->fg->predecessor_time, &fInfo->zebra_time)>0||nstime_cmp(&fInfo->fg->partner->fg->predecessor_time, &fInfo->fg->partner->zebra_time)>0) && fInfo->zebra_time.nsecs != MERGED_FILES && ON_method){
 				gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, NULL);
@@ -601,12 +601,12 @@ comparestat_draw(void *arg)
 	timestamp_set_precision(TS_PREC_AUTO_NSEC);
 	/* reset ordering */
 	nstime_set_unset(&cs->current_time);
-	
+
 	/* set color filter, in Routing environment */
 	if(TTL_method&&cs->ip_ttl_list->len!=0){
 		g_string_printf(filter_str, "%s %i %s %i", "ip.ttl ==", g_array_index(cs->ip_ttl_list, guint8, 0), "|| ip.ttl ==", g_array_index(cs->ip_ttl_list, guint8, 1));
 	} else if(cs->eth_dst.len!=0&&cs->eth_src.len!=0){
-		g_string_printf(filter_str, "%s %s %s %s", "eth.dst==", address_to_str(&cs->eth_dst), "|| eth.dst==", address_to_str(&cs->eth_src));
+		g_string_printf(filter_str, "%s %s %s %s", "eth.dst==", ep_address_to_str(&cs->eth_dst), "|| eth.dst==", ep_address_to_str(&cs->eth_src));
 	}
 	color_filters_set_tmp(COLOR_N, filter_str->str, FALSE);
 #ifdef NEW_PACKET_LIST
@@ -755,7 +755,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_)
 	timestamp_set_precision(TS_PREC_AUTO_NSEC);
 
 	/* transient_for top_level */
-	cs->win=dlg_window_new("compare-stat");  
+	cs->win=dlg_window_new("compare-stat");
 	gtk_window_set_destroy_with_parent (GTK_WINDOW(cs->win), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(cs->win), 550, 400);
 	comparestat_set_title(cs);
@@ -763,7 +763,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_)
 	vbox=gtk_vbox_new(FALSE, 3);
 	gtk_container_add(GTK_CONTAINER(cs->win), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
-	
+
 	title_string = g_strdup_printf("Compare two capture files: %s", cf_get_display_name(&cfile));
 	stat_label=gtk_label_new(title_string);
 	g_free(title_string);
@@ -797,7 +797,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_)
 	/* call this method when row is chosen*/
 	gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(cs->treeview)),GTK_SELECTION_SINGLE);
 	g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(cs->treeview)), "changed", G_CALLBACK(new_tree_view_selection_changed), cs);
-	
+
 	/* list with scrollbar's */
 	cs->scrolled_win=gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(cs->scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -871,7 +871,7 @@ comparestat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
 	} else {
 		report_failure("cannot open more than one compare of the same type at once");
 	}
-	
+
 	g_string_free(str, TRUE);
 }
 
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 32e1c9f657..265f6237c9 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -507,13 +507,13 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A <-> B */
         str = g_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_PORT):"",
                               sport?"==":"",
                               sport?sport:"",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_PORT):"",
                               dport?"==":"",
@@ -524,13 +524,13 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A --> B */
         str = g_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_PORT):"",
                               sport?"==":"",
                               sport?sport:"",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_PORT):"",
                               dport?"==":"",
@@ -541,13 +541,13 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A <-- B */
         str = g_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_PORT):"",
                               sport?"==":"",
                               sport?sport:"",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_PORT):"",
                               dport?"==":"",
@@ -558,7 +558,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A <-> ANY */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_PORT):"",
                               sport?"==":"",
@@ -569,7 +569,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A --> ANY */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_PORT):"",
                               sport?"==":"",
@@ -580,7 +580,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A <-- ANY */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_PORT):"",
                               sport?"==":"",
@@ -591,7 +591,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* ANY <-> B */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_PORT):"",
                               dport?"==":"",
@@ -602,7 +602,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* ANY <-- B */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_PORT):"",
                               dport?"==":"",
@@ -613,7 +613,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* ANY --> B */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_PORT):"",
                               dport?"==":"",
@@ -1012,7 +1012,7 @@ draw_ct_table_address(conversations_table *ct, int conversation_idx)
     rownum=gtk_clist_find_row_from_data(ct->table, (gpointer)(long)conversation_idx);
 
     if(!ct->resolve_names)
-        entry=address_to_str(&ct->conversations[conversation_idx].src_address);
+        entry=ep_address_to_str(&ct->conversations[conversation_idx].src_address);
     else {
         entry=get_addr_name(&ct->conversations[conversation_idx].src_address);
     }
@@ -1037,7 +1037,7 @@ draw_ct_table_address(conversations_table *ct, int conversation_idx)
     gtk_clist_set_text(ct->table, rownum, 1, entry);
 
     if(!ct->resolve_names)
-        entry=address_to_str(&ct->conversations[conversation_idx].dst_address);
+        entry=ep_address_to_str(&ct->conversations[conversation_idx].dst_address);
     else {
         entry=get_addr_name(&ct->conversations[conversation_idx].dst_address);
     }
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 5345424448..b1b1587f4f 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -335,7 +335,7 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c
     str = g_strdup_printf("%s==%s%s%s%s%s",
                           hostlist_get_filter_name(&hl->hosts[selection].address,
                                                    hl->hosts[selection].sat, hl->hosts[selection].port_type,  FN_ANY_ADDRESS),
-                          address_to_str(&hl->hosts[selection].address),
+                          ep_address_to_str(&hl->hosts[selection].address),
                           sport?" && ":"",
                           sport?hostlist_get_filter_name(&hl->hosts[selection].address, hl->hosts[selection].sat, hl->hosts[selection].port_type,  FN_ANY_PORT):"",
                           sport?"==":"",
@@ -446,7 +446,7 @@ draw_hostlist_table_address(hostlist_table *hl, int hostlist_idx)
     rownum=gtk_clist_find_row_from_data(hl->table, (gpointer)(long)hostlist_idx);
 
     if (!hl->resolve_names)
-        entry=address_to_str(&hl->hosts[hostlist_idx].address);
+        entry=ep_address_to_str(&hl->hosts[hostlist_idx].address);
     else
         entry=get_addr_name(&hl->hosts[hostlist_idx].address);
 
@@ -633,7 +633,7 @@ open_as_map_cb(GtkWindow *copy_bt, gpointer data _U_)
             col_bytes = i;
         }
     }
-   
+
     /* check for the minimum required data */
     if(col_lat == -1 || col_lon == -1) {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Latitude/Longitude data not available (GeoIP installed?)");
@@ -726,7 +726,7 @@ open_as_map_cb(GtkWindow *copy_bt, gpointer data _U_)
     /* copy ipmap.html to temp dir */
     src_file_path = get_datafile_path("ipmap.html");
     dst_file_path = g_strdup_printf("%s%cipmap.html", map_path, G_DIR_SEPARATOR);
-    
+
     if (!copy_file_binary_mode(src_file_path, dst_file_path)) {
         g_free(src_file_path);
         g_free(dst_file_path);
@@ -910,7 +910,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
     } else {
         bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
     }
-#else    
+#else
     bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
 #endif
 
@@ -934,7 +934,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
         g_signal_connect(map_bt, "clicked", G_CALLBACK(open_as_map_cb), NULL);
     }
 #endif /* HAVE_GEOIP */
-    
+
     help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
     g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_ENDPOINTS_DIALOG);
 
@@ -1196,7 +1196,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     /* Button row. */
 #ifdef HAVE_GEOIP
     bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, WIRESHARK_STOCK_MAP, GTK_STOCK_HELP, NULL);
-#else    
+#else
     bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
 #endif
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
@@ -1219,7 +1219,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     g_signal_connect(nb, "switch-page", G_CALLBACK(ct_nb_map_switch_page_cb), map_bt);
     gtk_widget_set_sensitive(map_bt, FALSE);
 #endif /* HAVE_GEOIP */
-    
+
     g_signal_connect(nb, "switch-page", G_CALLBACK(ct_nb_switch_page_cb), copy_bt);
 
     help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c
index d41dd0883d..408ad36e90 100644
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -69,7 +69,7 @@ extern guint16 burstint;
 extern guint32 trigger;
 extern guint32 bufferalarm;
 extern gint32 emptyspeed;
-extern gint32 cumulemptyspeed; 
+extern gint32 cumulemptyspeed;
 
 static const gchar FWD_LABEL_TEXT[] = "Select a stream with left mouse button";
 static const gchar PAR_LABEL_TEXT[] = "\nBurst int: ms   Burst alarm: pps    Buffer alarm: KB    Stream empty speed: Mbps    Total empty speed: Mbps\n";
@@ -132,13 +132,13 @@ static void add_to_clist(mcast_stream_info_t* strinfo)
 	/* Update the top label with the number of detected streams */
 	g_snprintf(label_text, sizeof(label_text),
 	        "Detected %d Multicast streams,   Average Bw: %.1f Mbps   Max Bw: %.1f Mbps   Max burst: %d / %dms   Max buffer: %.1f KB",
-	        ++streams_nb, 
-		mcaststream_get_info()->allstreams->average_bw, mcaststream_get_info()->allstreams->element.maxbw, 
-		mcaststream_get_info()->allstreams->element.topburstsize, burstint, 
+	        ++streams_nb,
+		mcaststream_get_info()->allstreams->average_bw, mcaststream_get_info()->allstreams->element.maxbw,
+		mcaststream_get_info()->allstreams->element.topburstsize, burstint,
 		(float)(mcaststream_get_info()->allstreams->element.topbuffusage)/1000);
 	 gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
-         g_snprintf(label_text, sizeof(label_text), "\nBurst int: %u ms   Burst alarm: %u pps   Buffer alarm: %u Bytes   Stream empty speed: %u Kbps   Total empty speed: %u Kbps\n", 
+         g_snprintf(label_text, sizeof(label_text), "\nBurst int: %u ms   Burst alarm: %u pps   Buffer alarm: %u Bytes   Stream empty speed: %u Kbps   Total empty speed: %u Kbps\n",
 		burstint, trigger, bufferalarm, emptyspeed, cumulemptyspeed);
 	gtk_label_set_text(GTK_LABEL(label_par), label_text);
 }
@@ -192,17 +192,17 @@ mcaststream_on_filter                    (GtkButton       *button _U_,
 	{
 		if (selected_stream_fwd->src_addr.type==AT_IPv6){
                     g_strlcpy(ip_version,"v6",sizeof(ip_version));
-		}		
+		}
 		else{
 			ip_version[0] = '\0';
 		}
 		filter_string_fwd = g_strdup_printf(
 			"(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u)",
 			ip_version,
-			address_to_str(&(selected_stream_fwd->src_addr)),
+			ep_address_to_str(&(selected_stream_fwd->src_addr)),
 			selected_stream_fwd->src_port,
 			ip_version,
-			address_to_str(&(selected_stream_fwd->dest_addr)),
+			ep_address_to_str(&(selected_stream_fwd->dest_addr)),
 			selected_stream_fwd->dest_port);
         filter_string = filter_string_fwd;
 	}
@@ -378,7 +378,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 	if ( (p == fnumber_text || *p != '\0') || (fnumber <=0) || (fnumber > 10000000) ){
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The total empty speed should be between 1 and 10000000");
 		return; }
-	cumulemptyspeed = fnumber; 
+	cumulemptyspeed = fnumber;
 
 	window_destroy(GTK_WIDGET(parent_w));
 
@@ -407,12 +407,12 @@ mcast_on_params                      (GtkButton       *button _U_,
                 return;
         }
 
-	mcast_params_dlg = dlg_window_new("Wireshark: Set parameters for Multicast Stream Analysis");  
+	mcast_params_dlg = dlg_window_new("Wireshark: Set parameters for Multicast Stream Analysis");
 	gtk_window_set_destroy_with_parent (GTK_WINDOW(mcast_params_dlg), TRUE);
         gtk_window_set_default_size(GTK_WINDOW(mcast_params_dlg), 210, 210);
 
         gtk_widget_show(mcast_params_dlg);
-	
+
         /* Container for each row of widgets */
         main_vb = gtk_vbox_new(FALSE, 3);
         gtk_container_set_border_width(GTK_CONTAINER(main_vb), 2);
@@ -465,7 +465,7 @@ mcast_on_params                      (GtkButton       *button _U_,
 	GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
 	gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);
-        
+
 	g_signal_connect(mcast_params_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
         g_signal_connect(mcast_params_dlg, "destroy", G_CALLBACK(mcast_params_destroy_cb), NULL);
 	g_signal_connect(ok_bt, "clicked", G_CALLBACK(mcast_params_ok_cb), mcast_params_dlg);
diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index bb1df06ff7..6135740ec0 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -197,7 +197,7 @@ static gboolean save_stream_ok_cb(GtkWidget *ok_bt _U_, gpointer fs)
 	/*  Dialog box needs to be always destroyed. Return TRUE      */
 	/*  so that caller will destroy the dialog box.               */
 	/*  See comment under rtpstream_on_save.                      */
-	rtpstream_save(selected_stream_fwd, g_dest);    
+	rtpstream_save(selected_stream_fwd, g_dest);
 	g_free(g_dest);
 	return TRUE;
 #endif
@@ -415,17 +415,17 @@ rtpstream_on_filter                    (GtkButton       *button _U_,
 	{
 		if (selected_stream_fwd->src_addr.type==AT_IPv6){
 			g_strlcpy(ip_version,"v6",sizeof(ip_version));
-		}		
+		}
 		else{
 			ip_version[0] = '\0';
 		}
 		filter_string_fwd = g_strdup_printf(
 			"(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)",
 			ip_version,
-			address_to_str(&(selected_stream_fwd->src_addr)),
+			ep_address_to_str(&(selected_stream_fwd->src_addr)),
 			selected_stream_fwd->src_port,
 			ip_version,
-			address_to_str(&(selected_stream_fwd->dest_addr)),
+			ep_address_to_str(&(selected_stream_fwd->dest_addr)),
 			selected_stream_fwd->dest_port,
 			selected_stream_fwd->ssrc);
         filter_string = filter_string_fwd;
@@ -435,17 +435,17 @@ rtpstream_on_filter                    (GtkButton       *button _U_,
 	{
 		if (selected_stream_rev->src_addr.type==AT_IPv6){
 			g_strlcpy(ip_version,"v6",sizeof(ip_version));
-		}		
+		}
 		else{
 			ip_version[0] = '\0';
 		}
 		filter_string_rev = g_strdup_printf(
 			"(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)",
 			ip_version,
-			address_to_str(&(selected_stream_rev->src_addr)),
+			ep_address_to_str(&(selected_stream_rev->src_addr)),
 			selected_stream_rev->src_port,
 			ip_version,
-			address_to_str(&(selected_stream_rev->dest_addr)),
+			ep_address_to_str(&(selected_stream_rev->dest_addr)),
 			selected_stream_rev->dest_port,
 			selected_stream_rev->ssrc);
 
@@ -492,7 +492,7 @@ rtpstream_on_copy_as_csv(GtkWindow *win _U_, gpointer data _U_)
 			gtk_clist_get_text(GTK_CLIST(clist),i,j,&table_entry);
 			g_string_append(CSV_str,table_entry);
 			g_string_append(CSV_str,",");
-		} 
+		}
 		g_string_append(CSV_str,"\n");
 	}
 
@@ -506,7 +506,7 @@ rtpstream_on_copy_as_csv(GtkWindow *win _U_, gpointer data _U_)
 static void
 rtpstream_on_analyse                   (GtkButton       *button _U_,
                                         gpointer         user_data _U_)
-{ 
+{
 	address ip_src_fwd;
 	guint16 port_src_fwd = 0;
 	address ip_dst_fwd;
@@ -522,12 +522,12 @@ rtpstream_on_analyse                   (GtkButton       *button _U_,
 	{
 		return;
 	}
-	
+
 	SET_ADDRESS(&ip_src_fwd,AT_NONE,0,NULL);
 	SET_ADDRESS(&ip_dst_fwd,AT_NONE,0,NULL);
 	SET_ADDRESS(&ip_src_rev,AT_NONE,0,NULL);
 	SET_ADDRESS(&ip_dst_rev,AT_NONE,0,NULL);
-	
+
 	if (selected_stream_fwd) {
 		COPY_ADDRESS(&(ip_src_fwd), &(selected_stream_fwd->src_addr));
 		port_src_fwd = selected_stream_fwd->src_port;
@@ -820,7 +820,7 @@ static void rtpstream_dlg_create (void)
     /*bt_copy = gtk_button_new_with_label ("Copy content to clipboard as CSV");*/
     bt_copy = gtk_button_new_from_stock(GTK_STOCK_COPY);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_copy);
-    gtk_tooltips_set_tip(tooltips, bt_copy, 
+    gtk_tooltips_set_tip(tooltips, bt_copy,
         "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
 
     bt_analyze = gtk_button_new_with_label ("Analyze");
diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index d7efb07b73..1830f25705 100644
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -223,9 +223,9 @@ sctpstat_draw(void *phs)
 
 	for(tmp = list ; tmp ; tmp=tmp->next) {
 
-		g_snprintf(str[0],  sizeof(char[256]),"%s", address_to_str(&tmp->src));
+		g_snprintf(str[0],  sizeof(char[256]),"%s", ep_address_to_str(&tmp->src));
 		g_snprintf(str[1],  sizeof(char[256]),"%u", tmp->sport);
-		g_snprintf(str[2],  sizeof(char[256]),"%s", address_to_str(&tmp->dst));
+		g_snprintf(str[2],  sizeof(char[256]),"%s", ep_address_to_str(&tmp->dst));
 		g_snprintf(str[3],  sizeof(char[256]),"%u", tmp->dport);
 		g_snprintf(str[4],  sizeof(char[256]),"%u", tmp->chunk_count[SCTP_DATA_CHUNK_ID]);
 		g_snprintf(str[5],  sizeof(char[256]),"%u", tmp->chunk_count[SCTP_SACK_CHUNK_ID]);
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index ddd7fcc63d..47c66abe47 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -648,9 +648,9 @@ static void create_drawing_area (struct graph *g)
 	g_snprintf (window_title, WINDOW_TITLE_LENGTH, "TCP Graph %d: %s %s:%d -> %s:%d",
 			refnum,
 			cf_get_display_name(&cfile),
-			address_to_str(&(thdr->ip_src)),
+			ep_address_to_str(&(thdr->ip_src)),
 			thdr->th_sport,
-			address_to_str(&(thdr->ip_dst)),
+			ep_address_to_str(&(thdr->ip_dst)),
 			thdr->th_dport
 	);
 	g->toplevel = dlg_window_new ("Tcp Graph");
diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c
index f83ff37d01..f5e70cc3b6 100644
--- a/gtk/wlan_stat_dlg.c
+++ b/gtk/wlan_stat_dlg.c
@@ -493,7 +493,7 @@ wlanstat_details(wlanstat_t *hs, wlan_ep_t *wlan_ep, gboolean clear)
 		if (hs->resolve_names) {
 			g_strlcpy (address, get_addr_name(&tmp->address), sizeof(address));
 		} else {
-			g_strlcpy (address, address_to_str(&tmp->address), sizeof(address));
+			g_strlcpy (address, ep_address_to_str(&tmp->address), sizeof(address));
 		}
 		if (basestation) {
 			g_strlcpy (comment, "Base station", sizeof(comment));
@@ -562,7 +562,7 @@ wlanstat_draw(void *phs)
 		if (hs->resolve_names) {
 			g_strlcpy (bssid, get_addr_name(&tmp->bssid), sizeof(bssid));
 		} else {
-			g_strlcpy (bssid, address_to_str(&tmp->bssid), sizeof(bssid));
+			g_strlcpy (bssid, ep_address_to_str(&tmp->bssid), sizeof(bssid));
 		}
 		if (tmp->stats.channel) {
 			g_snprintf (channel, sizeof(channel), "%u", tmp->stats.channel);
@@ -757,18 +757,18 @@ wlan_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callb
 
 	switch (value) {
 	case VALUE_BSSID_ONLY:
-		str = g_strdup_printf("wlan.bssid==%s", address_to_str(&ep->bssid));
+		str = g_strdup_printf("wlan.bssid==%s", ep_address_to_str(&ep->bssid));
 		break;
 	case VALUE_SSID_ONLY:
 		str = g_strdup_printf("wlan_mgt.ssid==\"%s\"", format_text(ep->stats.ssid, ep->stats.ssid_len));
 		break;
 	case VALUE_BSSID_AND_SSID:
 		str = g_strdup_printf("wlan.bssid==%s && wlan_mgt.ssid==\"%s\"",
-				      address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
+				      ep_address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
 		break;
 	case VALUE_BSSID_OR_SSID:
 		str = g_strdup_printf("wlan.bssid==%s || wlan_mgt.ssid==\"%s\"",
-				      address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
+				      ep_address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
 		break;
 	}
 
@@ -791,7 +791,7 @@ wlan_details_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, gui
 	gtk_tree_selection_get_selected (sel, &model, &iter);
 	gtk_tree_model_get (model, &iter, DETAILS_COLUMN, &ep, -1);
 
-	str = g_strdup_printf("wlan.addr==%s", address_to_str(&ep->address));
+	str = g_strdup_printf("wlan.addr==%s", ep_address_to_str(&ep->address));
 
 	apply_selected_filter (callback_action, str);
 
diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c
index b41583d531..adcca0f38c 100644
--- a/plugins/stats_tree/pinfo_stats_tree.c
+++ b/plugins/stats_tree/pinfo_stats_tree.c
@@ -54,14 +54,14 @@ static int st_node_ip = -1;
 static const gchar* st_str_ip = "IP Addresses";
 
 static void ip_hosts_stats_tree_init(stats_tree* st) {
-	st_node_ip = stats_tree_create_node(st, st_str_ip, 0, TRUE);	
+	st_node_ip = stats_tree_create_node(st, st_str_ip, 0, TRUE);
 }
 
 static int ip_hosts_stats_tree_packet(stats_tree *st  , packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) {
 	tick_stat_node(st, st_str_ip, 0, FALSE);
-	tick_stat_node(st, address_to_str(&pinfo->net_src), st_node_ip, FALSE);
-	tick_stat_node(st, address_to_str(&pinfo->net_dst), st_node_ip, FALSE);
-	
+	tick_stat_node(st, ep_address_to_str(&pinfo->net_src), st_node_ip, FALSE);
+	tick_stat_node(st, ep_address_to_str(&pinfo->net_dst), st_node_ip, FALSE);
+
 	return 1;
 }
 
@@ -75,15 +75,15 @@ static void ptype_stats_tree_init(stats_tree* st) {
 
 static int ptype_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) {
 	const gchar* ptype;
-	
+
 	ptype = port_type_to_str(pinfo->ptype);
 
 	stats_tree_tick_pivot(st,st_node_ptype,ptype);
-	
+
 	return 1;
 }
 
-/* packet length stats_tree -- test range node */ 
+/* packet length stats_tree -- test range node */
 static int st_node_plen = -1;
 static const gchar* st_str_plen = "Packet Lengths";
 
@@ -94,7 +94,7 @@ static void plen_stats_tree_init(stats_tree* st) {
 static int plen_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) {
 	tick_stat_node(st, st_str_plen, 0, FALSE);
 	stats_tree_tick_range(st, st_str_plen, 0, pinfo->fd->pkt_len);
-	
+
 	return 1;
 }
 
@@ -108,23 +108,23 @@ static int st_node_dsts = -1;
 static const gchar* st_str_dsts = "IP Destinations";
 
 static void dsts_stats_tree_init(stats_tree* st) {
-	st_node_dsts = stats_tree_create_node(st, st_str_dsts, 0, TRUE);	
+	st_node_dsts = stats_tree_create_node(st, st_str_dsts, 0, TRUE);
 }
 
 static int dsts_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) {
 	static gchar str[128];
 	int ip_dst_node;
 	int proto_node;
-	
+
 	tick_stat_node(st, st_str_dsts, 0, FALSE);
-	
-	ip_dst_node = tick_stat_node(st, address_to_str(&pinfo->net_src), st_node_dsts, TRUE);
-	
+
+	ip_dst_node = tick_stat_node(st, ep_address_to_str(&pinfo->net_src), st_node_dsts, TRUE);
+
 	proto_node = tick_stat_node(st,port_type_to_str(pinfo->ptype),ip_dst_node,TRUE);
 
 	g_snprintf(str, sizeof(str),"%u",pinfo->destport);
 	tick_stat_node(st,str,proto_node,TRUE);
-	
+
 	return 1;
 }
 
@@ -135,4 +135,4 @@ void register_pinfo_stat_trees(void) {
 	stats_tree_register_with_group("frame","plen",st_str_plen, 0, plen_stats_tree_packet, plen_stats_tree_init, NULL, REGISTER_STAT_GROUP_GENERIC );
 	stats_tree_register("ip","dests",st_str_dsts, 0, dsts_stats_tree_packet, dsts_stats_tree_init, NULL );
 }
- 
+
diff --git a/tap-iousers.c b/tap-iousers.c
index 13361c872a..d25417e23a 100644
--- a/tap-iousers.c
+++ b/tap-iousers.c
@@ -81,20 +81,20 @@ iousers_udpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 
 	if(udph->uh_sport>udph->uh_dport){
 		direction=0;
-		g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-		g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
 	} else if(udph->uh_sport<udph->uh_dport){
 		direction=1;
-		g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-		g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
 	} else if(CMP_ADDRESS(&udph->ip_src, &udph->ip_dst)>0){
 		direction=0;
-		g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-		g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
 	} else {
 		direction=1;
-		g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-		g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
 	}
 
 	for(iui=iu->items;iui;iui=iui->next){
@@ -144,16 +144,16 @@ iousers_sctp_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, cons
 
 	if(sctph->sport > sctph->dport) {
 		direction=0;
-		g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);
-		g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&sctph->ip_src),s_sport);
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&sctph->ip_dst),s_dport);
 	} else if(sctph->sport < sctph->dport) {
 		direction=1;
-		g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);
-		g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&sctph->ip_src),s_sport);
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&sctph->ip_dst),s_dport);
 	} else {
 		direction=0;
-		g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);
-		g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&sctph->ip_src),s_sport);
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&sctph->ip_dst),s_dport);
 	}
 
 	for(iui=iu->items;iui;iui=iui->next){
@@ -200,20 +200,20 @@ iousers_tcpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 
 	if(tcph->th_sport>tcph->th_dport){
 		direction=0;
-		g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-		g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
 	} else if(tcph->th_sport<tcph->th_dport){
 		direction=1;
-		g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-		g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
 	} else if(CMP_ADDRESS(&tcph->ip_src, &tcph->ip_dst)>0){
 		direction=0;
-		g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-		g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
 	} else {
 		direction=1;
-		g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-		g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+		g_snprintf(name2,256,"%s:%s",ep_address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
+		g_snprintf(name1,256,"%s:%s",ep_address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
 	}
 
 	for(iui=iu->items;iui;iui=iui->next){
@@ -277,9 +277,9 @@ iousers_ip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 		iui->next=iu->items;
 		iu->items=iui;
 		COPY_ADDRESS(&iui->addr1, addr1);
-		iui->name1=g_strdup(address_to_str(addr1));
+		iui->name1=g_strdup(ep_address_to_str(addr1));
 		COPY_ADDRESS(&iui->addr2, addr2);
-		iui->name2=g_strdup(address_to_str(addr2));
+		iui->name2=g_strdup(ep_address_to_str(addr2));
 		iui->frames1=0;
 		iui->frames2=0;
 		iui->bytes1=0;
@@ -325,9 +325,9 @@ iousers_ipx_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 		iui->next=iu->items;
 		iu->items=iui;
 		COPY_ADDRESS(&iui->addr1, addr1);
-		iui->name1=g_strdup(address_to_str(addr1));
+		iui->name1=g_strdup(ep_address_to_str(addr1));
 		COPY_ADDRESS(&iui->addr2, addr2);
-		iui->name2=g_strdup(address_to_str(addr2));
+		iui->name2=g_strdup(ep_address_to_str(addr2));
 		iui->frames1=0;
 		iui->frames2=0;
 		iui->bytes1=0;
@@ -373,9 +373,9 @@ iousers_fc_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 		iui->next=iu->items;
 		iu->items=iui;
 		COPY_ADDRESS(&iui->addr1, addr1);
-		iui->name1=g_strdup(address_to_str(addr1));
+		iui->name1=g_strdup(ep_address_to_str(addr1));
 		COPY_ADDRESS(&iui->addr2, addr2);
-		iui->name2=g_strdup(address_to_str(addr2));
+		iui->name2=g_strdup(ep_address_to_str(addr2));
 		iui->frames1=0;
 		iui->frames2=0;
 		iui->bytes1=0;
@@ -421,9 +421,9 @@ iousers_eth_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 		iui->next=iu->items;
 		iu->items=iui;
 		COPY_ADDRESS(&iui->addr1, addr1);
-		iui->name1=g_strdup(address_to_str(addr1));
+		iui->name1=g_strdup(ep_address_to_str(addr1));
 		COPY_ADDRESS(&iui->addr2, addr2);
-		iui->name2=g_strdup(address_to_str(addr2));
+		iui->name2=g_strdup(ep_address_to_str(addr2));
 		iui->frames1=0;
 		iui->frames2=0;
 		iui->bytes1=0;
@@ -469,9 +469,9 @@ iousers_fddi_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, cons
 		iui->next=iu->items;
 		iu->items=iui;
 		COPY_ADDRESS(&iui->addr1, addr1);
-		iui->name1=g_strdup(address_to_str(addr1));
+		iui->name1=g_strdup(ep_address_to_str(addr1));
 		COPY_ADDRESS(&iui->addr2, addr2);
-		iui->name2=g_strdup(address_to_str(addr2));
+		iui->name2=g_strdup(ep_address_to_str(addr2));
 		iui->frames1=0;
 		iui->frames2=0;
 		iui->bytes1=0;
@@ -517,9 +517,9 @@ iousers_tr_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 		iui->next=iu->items;
 		iu->items=iui;
 		COPY_ADDRESS(&iui->addr1, addr1);
-		iui->name1=g_strdup(address_to_str(addr1));
+		iui->name1=g_strdup(ep_address_to_str(addr1));
 		COPY_ADDRESS(&iui->addr2, addr2);
-		iui->name2=g_strdup(address_to_str(addr2));
+		iui->name2=g_strdup(ep_address_to_str(addr2));
 		iui->frames1=0;
 		iui->frames2=0;
 		iui->bytes1=0;
diff --git a/tap-sctpchunkstat.c b/tap-sctpchunkstat.c
index a7ef6efa04..800af2e250 100644
--- a/tap-sctpchunkstat.c
+++ b/tap-sctpchunkstat.c
@@ -199,8 +199,8 @@ sctpstat_draw(void *phs)
 
 	for(tmp = list ; tmp ; tmp=tmp->next) {
 		printf("|%15s|%5u|%15s|%5u|%8u|%8u|%8u|%8u|%8u|%8u|%8u|%8u|%8u|%8u|\n",
-		       address_to_str(&tmp->src),tmp->sport,
-		       address_to_str(&tmp->dst),tmp->dport,
+		       ep_address_to_str(&tmp->src),tmp->sport,
+		       ep_address_to_str(&tmp->dst),tmp->dport,
 		       tmp->chunk_count[SCTP_DATA_CHUNK_ID],
 		       tmp->chunk_count[SCTP_SACK_CHUNK_ID],
 		       tmp->chunk_count[SCTP_HEARTBEAT_CHUNK_ID],