Merge branch 'master' into v3-experimental

value_reader.go

@@ -60,6 +60,20 @@ func (r *ValueReader) ReadInt16() int16 {
 	return r.mr.readInt16()
 }
 
+func (r *ValueReader) ReadUint16() uint16 {
+	if r.err != nil {
+		return 0
+	}
+
+	r.valueBytesRemaining -= 2
+	if r.valueBytesRemaining < 0 {
+		r.Fatal(errors.New("read past end of value"))
+		return 0
+	}
+
+	return r.mr.readUint16()
+}
+
 func (r *ValueReader) ReadInt32() int32 {
 	if r.err != nil {
 		return 0
@@ -74,6 +88,20 @@ func (r *ValueReader) ReadInt32() int32 {
 	return r.mr.readInt32()
 }
 
+func (r *ValueReader) ReadUint32() uint32 {
+	if r.err != nil {
+		return 0
+	}
+
+	r.valueBytesRemaining -= 4
+	if r.valueBytesRemaining < 0 {
+		r.Fatal(errors.New("read past end of value"))
+		return 0
+	}
+
+	return r.mr.readUint32()
+}
+
 func (r *ValueReader) ReadInt64() int64 {
 	if r.err != nil {
 		return 0
@@ -89,7 +117,7 @@ func (r *ValueReader) ReadInt64() int64 {
 }
 
 func (r *ValueReader) ReadOID() OID {
-	return OID(r.ReadInt32())
+	return OID(r.ReadUint32())
 }
 
 // ReadString reads count bytes and returns as string