diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-05-04 18:25:43 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-05-04 18:25:43 +0000 |
| commit | 9aa7db004230d1e2d58b2af6ad65b5960ecee287 (patch) | |
| tree | bdc7000233da7e5e0f43d16ad1dbde7fd261cefb | |
| parent | 8f88da8a1620d3e995f307ff5eb14bfa278e2fdf (diff) | |
From LEGO fix "Dissector bug, Protocol H248"
svn path=/trunk/; revision=18093
| -rw-r--r-- | asn1/h248/packet-h248-template.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index a84d3db460..9e881f23c1 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -1188,8 +1188,8 @@ static h248_msg_t* h248_msg(packet_info* pinfo, int o) { m->hi_addr = 0; break; case AT_IPv4: - memcpy((guint8*)m->hi_addr,hi_addr->data,4); - memcpy((guint8*)m->lo_addr,lo_addr->data,4); + memcpy((guint8*)&(m->hi_addr),hi_addr->data,4); + memcpy((guint8*)&(m->lo_addr),lo_addr->data,4); break; case AT_SS7PC: m->hi_addr = mtp3_pc_hash(hi_addr->data); diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 49dbda10a4..46b2d23bc0 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* ./packet-h248.c */ +/* .\packet-h248.c */ /* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ /* Input file: packet-h248-template.c */ @@ -1594,8 +1594,8 @@ static h248_msg_t* h248_msg(packet_info* pinfo, int o) { m->hi_addr = 0; break; case AT_IPv4: - memcpy((guint8*)m->hi_addr,hi_addr->data,4); - memcpy((guint8*)m->lo_addr,lo_addr->data,4); + memcpy((guint8*)&(m->hi_addr),hi_addr->data,4); + memcpy((guint8*)&(m->lo_addr),lo_addr->data,4); break; case AT_SS7PC: m->hi_addr = mtp3_pc_hash(hi_addr->data); diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index e8b693d0f7..6752b2cb01 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* ./packet-h248.h */ +/* .\packet-h248.h */ /* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ /* Input file: packet-h248-template.h */ |