aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-12-07 15:02:55 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-12-07 15:02:55 +0000
commit0e5bc8a49c4778ffabf930ad325fef0321853e88 (patch)
treefbee5c11be7ab53a544183abcca22d427a8ae330
parente67762e3434277cd2d9fad16ec7e54a9b4dfc228 (diff)
Add string encoding for ISO/IEC 8859-2 (ENC_ISO_8859_2)
svn path=/trunk/; revision=53826
-rw-r--r--epan/charsets.c20
-rw-r--r--epan/charsets.h3
-rw-r--r--epan/proto.h1
-rw-r--r--epan/tvbuff.c8
4 files changed, 32 insertions, 0 deletions
diff --git a/epan/charsets.c b/epan/charsets.c
index f3406b6078..cd6cba5034 100644
--- a/epan/charsets.c
+++ b/epan/charsets.c
@@ -171,6 +171,26 @@ EBCDIC_to_ASCII1(guint8 c)
/* REPLACEMENT CHARACTER */
#define UNREPL 0xFFFD
+/* ISO-8859-2 */
+const gunichar2 charset_table_iso_8859_2[0x80] = {
+ UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, /* 0x80 - */
+ UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, /* - 0x8F */
+ UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, /* 0x90 - */
+ UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, UNREPL, /* - 0x9F */
+ 0x00a0, 0x0104, 0x02d8, 0x0141, 0x00a4, 0x013d, 0x015a, 0x00a7, /* 0xA0 - */
+ 0x00a8, 0x0160, 0x015e, 0x0164, 0x0179, 0x00ad, 0x017d, 0x017b, /* - 0xAF */
+ 0x00b0, 0x0105, 0x02db, 0x0142, 0x00b4, 0x013e, 0x015b, 0x02c7, /* 0xB0 - */
+ 0x00b8, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, /* - 0xBF */
+ 0x0154, 0x00c1, 0x00c2, 0x0102, 0x00c4, 0x0139, 0x0106, 0x00c7, /* 0xC0 - */
+ 0x010c, 0x00c9, 0x0118, 0x00cb, 0x011a, 0x00cd, 0x00ce, 0x010e, /* - 0xCF */
+ 0x0110, 0x0143, 0x0147, 0x00d3, 0x00d4, 0x0150, 0x00d6, 0x00d7, /* 0xD0 - */
+ 0x0158, 0x016e, 0x00da, 0x0170, 0x00dc, 0x00dd, 0x0162, 0x00df, /* - 0xDF */
+ 0x0155, 0x00e1, 0x00e2, 0x0103, 0x00e4, 0x013a, 0x0107, 0x00e7, /* 0xE0 - */
+ 0x010d, 0x00e9, 0x0119, 0x00eb, 0x011b, 0x00ed, 0x00ee, 0x010f, /* - 0xEF */
+ 0x0111, 0x0144, 0x0148, 0x00f3, 0x00f4, 0x0151, 0x00f6, 0x00f7, /* 0xF0 - */
+ 0x0159, 0x016f, 0x00fa, 0x0171, 0x00fc, 0x00fd, 0x0163, 0x02d9 /* - 0xFF */
+};
+
/* Windows-1250 */
const gunichar2 charset_table_cp1250[0x80] = {
0x20ac, UNREPL, 0x201a, UNREPL, 0x201e, 0x2026, 0x2020, 0x2021, /* 0x80 - */
diff --git a/epan/charsets.h b/epan/charsets.h
index 0764eac600..8f3e8a6c8c 100644
--- a/epan/charsets.h
+++ b/epan/charsets.h
@@ -42,6 +42,9 @@ guint8 EBCDIC_to_ASCII1(guint8 c);
/* Table for windows-1250 */
extern const gunichar2 charset_table_cp1250[0x80];
+/* Tables for ISO-8859-X */
+extern const gunichar2 charset_table_iso_8859_2[0x80];
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/epan/proto.h b/epan/proto.h
index 52da76df16..e5c8af62fe 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -285,6 +285,7 @@ WS_DLL_PUBLIC WS_MSVC_NORETURN void proto_report_dissector_bug(const char *messa
#define ENC_UCS_2 0x00000006
#define ENC_EBCDIC 0x00000008
#define ENC_WINDOWS_1250 0x0000000A /* http://en.wikipedia.org/wiki/Windows-1250 */
+#define ENC_ISO_8859_2 0x0000000C /* http://en.wikipedia.org/wiki/ISO/IEC_8859-2#Code_page_layout */
/*
* TODO:
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index 3180ec0794..c6d5c8c6fa 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -1911,6 +1911,10 @@ tvb_get_string_enc(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset,
strbuf = tvb_get_string_unichar2(scope, tvb, offset, length, charset_table_cp1250);
break;
+ case ENC_ISO_8859_2:
+ strbuf = tvb_get_string_unichar2(scope, tvb, offset, length, charset_table_iso_8859_2);
+ break;
+
case ENC_UTF_8:
/*
* XXX - should map all invalid UTF-8 sequences
@@ -2026,6 +2030,10 @@ tvb_get_stringz_enc(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, g
strptr = tvb_get_stringz_unichar2(scope, tvb, offset, lengthp, charset_table_cp1250);
break;
+ case ENC_ISO_8859_2:
+ strptr = tvb_get_stringz_unichar2(scope, tvb, offset, lengthp, charset_table_iso_8859_2);
+ break;
+
case ENC_UTF_8:
/*
* XXX - should map all invalid UTF-8 sequences