Update Free Software Foundation address.

[metze/wireshark/wip.git] / epan / dissectors / packet-sv.c

diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c
index 5111b2f6482dd9f182626aeb8571a0aac0c1dcdc..61aded305f2125b168a5aa1040303fdf8b7ae388 100644 (file)
--- a/epan/dissectors/packet-sv.c
+++ b/epan/dissectors/packet-sv.c
@@ -28,7 +28,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -200,7 +200,7 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv
                        qual = tvb_get_ntohl(tvb, offset + 4);
 
                        proto_tree_add_item(subtree, hf_sv_phmeas_instmag_i, tvb, offset, 4, ENC_BIG_ENDIAN);
-                       proto_tree_add_bitmask(subtree, tvb, offset + 4, hf_sv_phsmeas_q, ett_phsmeas_q, q_flags, FALSE);
+                       proto_tree_add_bitmask(subtree, tvb, offset + 4, hf_sv_phsmeas_q, ett_phsmeas_q, q_flags, ENC_BIG_ENDIAN);
 
                        if (i < IEC61850_SV_MAX_PHSMEAS_ENTRIES) {
                                sv_data.phsMeas[i].value = value;
@@ -378,7 +378,7 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
        asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
        if (parent_tree){
-               item = proto_tree_add_item(parent_tree, proto_sv, tvb, 0, -1, FALSE);
+               item = proto_tree_add_item(parent_tree, proto_sv, tvb, 0, -1, ENC_NA);
                tree = proto_item_add_subtree(item, ett_sv);
        }
        col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
@@ -406,7 +406,6 @@ dissect_sv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
                offset = dissect_sv_SampledValues(FALSE, tvb, offset, &asn1_ctx , tree, -1);
                if (offset == old_offset) {
                        proto_tree_add_text(tree, tvb, offset, -1, "Internal error, zero-byte SV PDU");
-                       offset = tvb_length(tvb);
                        break;
                }
        }