1. docker
  2. Commit 96c7cba64c560d89440d427d293b2fd7ff8f3578
Browse code

networkdb, drivers: Regenerate protocol buffers

agent.pb.go is unchanged, but the files in networkdb and drivers
are slightly different when regenerated using the current versions
of protoc and gogoproto. This is probably because agent.pb.go
was last regenerated quite recently, in February 2018, whereas
networkdb.pb.go and overlay/overlay.pb.go were last changed in 2017,
and windows/overlay/overlay.pb.go was last changed in 2016.

Signed-off-by: Euan Harris <euan.harris@docker.com>

Euan Harris authored on 2018/06/21 01:23:09
Showing 3 changed files
libnetwork/drivers/overlay/overlay.pb.go
History View file @ 96c7cba
... ... 
@@ -1,12 +1,11 @@
1 
-// Code generated by protoc-gen-gogo.
2 
-// source: overlay.proto
3 
-// DO NOT EDIT!
1 
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
2 
+// source: drivers/overlay/overlay.proto
4 3
5 4 
 /*
6 5 
 	Package overlay is a generated protocol buffer package.
7 6
8 7 
 	It is generated from these files:
9 
-		overlay.proto
8 
+		drivers/overlay/overlay.proto
10 9
11 10 
 	It has these top-level messages:
12 11 
 		PeerRecord
... ... 
@@ -19,9 +18,6 @@ import math "math"
19 19 
 import _ "github.com/gogo/protobuf/gogoproto"
20 20
21 21 
 import strings "strings"
22 
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
23 
-import sort "sort"
24 
-import strconv "strconv"
25 22 
 import reflect "reflect"
26 23
27 24 
 import io "io"
... ... 
@@ -33,7 +29,9 @@ var _ = math.Inf
33 33
34 34 
 // This is a compile-time assertion to ensure that this generated file
35 35 
 // is compatible with the proto package it is being compiled against.
36 
-const _ = proto.GoGoProtoPackageIsVersion1
36 
+// A compilation error at this line likely means your copy of the
37 
+// proto package needs to be updated.
38 
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
37 39
38 40 
 // PeerRecord defines the information corresponding to a peer
39 41 
 // container in the overlay network.
... ... 
@@ -54,6 +52,27 @@ func (m *PeerRecord) Reset()                    { *m = PeerRecord{} }
54 54 
 func (*PeerRecord) ProtoMessage()               {}
55 55 
 func (*PeerRecord) Descriptor() ([]byte, []int) { return fileDescriptorOverlay, []int{0} }
56 56
57 
+func (m *PeerRecord) GetEndpointIP() string {
58 
+	if m != nil {
59 
+		return m.EndpointIP
60 
+	}
61 
+	return ""
62 
+}
63 
+
64 
+func (m *PeerRecord) GetEndpointMAC() string {
65 
+	if m != nil {
66 
+		return m.EndpointMAC
67 
+	}
68 
+	return ""
69 
+}
70 
+
71 
+func (m *PeerRecord) GetTunnelEndpointIP() string {
72 
+	if m != nil {
73 
+		return m.TunnelEndpointIP
74 
+	}
75 
+	return ""
76 
+}
77 
+
57 78 
 func init() {
58 79 
 	proto.RegisterType((*PeerRecord)(nil), "overlay.PeerRecord")
59 80 
 }
... ... 
@@ -77,84 +96,49 @@ func valueToGoStringOverlay(v interface{}, typ string) string {
77 77 
 	pv := reflect.Indirect(rv).Interface()
78 78 
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
79 79 
 }
80 
-func extensionToGoStringOverlay(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
81 
-	if e == nil {
82 
-		return "nil"
83 
-	}
84 
-	s := "map[int32]proto.Extension{"
85 
-	keys := make([]int, 0, len(e))
86 
-	for k := range e {
87 
-		keys = append(keys, int(k))
88 
-	}
89 
-	sort.Ints(keys)
90 
-	ss := []string{}
91 
-	for _, k := range keys {
92 
-		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
93 
-	}
94 
-	s += strings.Join(ss, ",") + "}"
95 
-	return s
96 
-}
97 
-func (m *PeerRecord) Marshal() (data []byte, err error) {
80 
+func (m *PeerRecord) Marshal() (dAtA []byte, err error) {
98 81 
 	size := m.Size()
99 
-	data = make([]byte, size)
100 
-	n, err := m.MarshalTo(data)
82 
+	dAtA = make([]byte, size)
83 
+	n, err := m.MarshalTo(dAtA)
101 84 
 	if err != nil {
102 85 
 		return nil, err
103 86 
 	}
104 
-	return data[:n], nil
87 
+	return dAtA[:n], nil
105 88 
 }
106 89
107 
-func (m *PeerRecord) MarshalTo(data []byte) (int, error) {
90 
+func (m *PeerRecord) MarshalTo(dAtA []byte) (int, error) {
108 91 
 	var i int
109 92 
 	_ = i
110 93 
 	var l int
111 94 
 	_ = l
112 95 
 	if len(m.EndpointIP) > 0 {
113 
-		data[i] = 0xa
96 
+		dAtA[i] = 0xa
114 97 
 		i++
115 
-		i = encodeVarintOverlay(data, i, uint64(len(m.EndpointIP)))
116 
-		i += copy(data[i:], m.EndpointIP)
98 
+		i = encodeVarintOverlay(dAtA, i, uint64(len(m.EndpointIP)))
99 
+		i += copy(dAtA[i:], m.EndpointIP)
117 100 
 	}
118 101 
 	if len(m.EndpointMAC) > 0 {
119 
-		data[i] = 0x12
102 
+		dAtA[i] = 0x12
120 103 
 		i++
121 
-		i = encodeVarintOverlay(data, i, uint64(len(m.EndpointMAC)))
122 
-		i += copy(data[i:], m.EndpointMAC)
104 
+		i = encodeVarintOverlay(dAtA, i, uint64(len(m.EndpointMAC)))
105 
+		i += copy(dAtA[i:], m.EndpointMAC)
123 106 
 	}
124 107 
 	if len(m.TunnelEndpointIP) > 0 {
125 
-		data[i] = 0x1a
108 
+		dAtA[i] = 0x1a
126 109 
 		i++
127 
-		i = encodeVarintOverlay(data, i, uint64(len(m.TunnelEndpointIP)))
128 
-		i += copy(data[i:], m.TunnelEndpointIP)
110 
+		i = encodeVarintOverlay(dAtA, i, uint64(len(m.TunnelEndpointIP)))
111 
+		i += copy(dAtA[i:], m.TunnelEndpointIP)
129 112 
 	}
130 113 
 	return i, nil
131 114 
 }
132 115
133 
-func encodeFixed64Overlay(data []byte, offset int, v uint64) int {
134 
-	data[offset] = uint8(v)
135 
-	data[offset+1] = uint8(v >> 8)
136 
-	data[offset+2] = uint8(v >> 16)
137 
-	data[offset+3] = uint8(v >> 24)
138 
-	data[offset+4] = uint8(v >> 32)
139 
-	data[offset+5] = uint8(v >> 40)
140 
-	data[offset+6] = uint8(v >> 48)
141 
-	data[offset+7] = uint8(v >> 56)
142 
-	return offset + 8
143 
-}
144 
-func encodeFixed32Overlay(data []byte, offset int, v uint32) int {
145 
-	data[offset] = uint8(v)
146 
-	data[offset+1] = uint8(v >> 8)
147 
-	data[offset+2] = uint8(v >> 16)
148 
-	data[offset+3] = uint8(v >> 24)
149 
-	return offset + 4
150 
-}
151 
-func encodeVarintOverlay(data []byte, offset int, v uint64) int {
116 
+func encodeVarintOverlay(dAtA []byte, offset int, v uint64) int {
152 117 
 	for v >= 1<<7 {
153 
-		data[offset] = uint8(v&0x7f | 0x80)
118 
+		dAtA[offset] = uint8(v&0x7f | 0x80)
154 119 
 		v >>= 7
155 120 
 		offset++
156 121 
 	}
157 
-	data[offset] = uint8(v)
122 
+	dAtA[offset] = uint8(v)
158 123 
 	return offset + 1
159 124 
 }
160 125 
 func (m *PeerRecord) Size() (n int) {
... ... 
@@ -208,8 +192,8 @@ func valueToStringOverlay(v interface{}) string {
208 208 
 	pv := reflect.Indirect(rv).Interface()
209 209 
 	return fmt.Sprintf("*%v", pv)
210 210 
 }
211 
-func (m *PeerRecord) Unmarshal(data []byte) error {
212 
-	l := len(data)
211 
+func (m *PeerRecord) Unmarshal(dAtA []byte) error {
212 
+	l := len(dAtA)
213 213 
 	iNdEx := 0
214 214 
 	for iNdEx < l {
215 215 
 		preIndex := iNdEx
... ... 
@@ -221,7 +205,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
221 221 
 			if iNdEx >= l {
222 222 
 				return io.ErrUnexpectedEOF
223 223 
 			}
224 
-			b := data[iNdEx]
224 
+			b := dAtA[iNdEx]
225 225 
 			iNdEx++
226 226 
 			wire |= (uint64(b) & 0x7F) << shift
227 227 
 			if b < 0x80 {
... ... 
@@ -249,7 +233,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
249 249 
 				if iNdEx >= l {
250 250 
 					return io.ErrUnexpectedEOF
251 251 
 				}
252 
-				b := data[iNdEx]
252 
+				b := dAtA[iNdEx]
253 253 
 				iNdEx++
254 254 
 				stringLen |= (uint64(b) & 0x7F) << shift
255 255 
 				if b < 0x80 {
... ... 
@@ -264,7 +248,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
264 264 
 			if postIndex > l {
265 265 
 				return io.ErrUnexpectedEOF
266 266 
 			}
267 
-			m.EndpointIP = string(data[iNdEx:postIndex])
267 
+			m.EndpointIP = string(dAtA[iNdEx:postIndex])
268 268 
 			iNdEx = postIndex
269 269 
 		case 2:
270 270 
 			if wireType != 2 {
... ... 
@@ -278,7 +262,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
278 278 
 				if iNdEx >= l {
279 279 
 					return io.ErrUnexpectedEOF
280 280 
 				}
281 
-				b := data[iNdEx]
281 
+				b := dAtA[iNdEx]
282 282 
 				iNdEx++
283 283 
 				stringLen |= (uint64(b) & 0x7F) << shift
284 284 
 				if b < 0x80 {
... ... 
@@ -293,7 +277,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
293 293 
 			if postIndex > l {
294 294 
 				return io.ErrUnexpectedEOF
295 295 
 			}
296 
-			m.EndpointMAC = string(data[iNdEx:postIndex])
296 
+			m.EndpointMAC = string(dAtA[iNdEx:postIndex])
297 297 
 			iNdEx = postIndex
298 298 
 		case 3:
299 299 
 			if wireType != 2 {
... ... 
@@ -307,7 +291,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
307 307 
 				if iNdEx >= l {
308 308 
 					return io.ErrUnexpectedEOF
309 309 
 				}
310 
-				b := data[iNdEx]
310 
+				b := dAtA[iNdEx]
311 311 
 				iNdEx++
312 312 
 				stringLen |= (uint64(b) & 0x7F) << shift
313 313 
 				if b < 0x80 {
... ... 
@@ -322,11 +306,11 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
322 322 
 			if postIndex > l {
323 323 
 				return io.ErrUnexpectedEOF
324 324 
 			}
325 
-			m.TunnelEndpointIP = string(data[iNdEx:postIndex])
325 
+			m.TunnelEndpointIP = string(dAtA[iNdEx:postIndex])
326 326 
 			iNdEx = postIndex
327 327 
 		default:
328 328 
 			iNdEx = preIndex
329 
-			skippy, err := skipOverlay(data[iNdEx:])
329 
+			skippy, err := skipOverlay(dAtA[iNdEx:])
330 330 
 			if err != nil {
331 331 
 				return err
332 332 
 			}
... ... 
@@ -345,8 +329,8 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
345 345 
 	}
346 346 
 	return nil
347 347 
 }
348 
-func skipOverlay(data []byte) (n int, err error) {
349 
-	l := len(data)
348 
+func skipOverlay(dAtA []byte) (n int, err error) {
349 
+	l := len(dAtA)
350 350 
 	iNdEx := 0
351 351 
 	for iNdEx < l {
352 352 
 		var wire uint64
... ... 
@@ -357,7 +341,7 @@ func skipOverlay(data []byte) (n int, err error) {
357 357 
 			if iNdEx >= l {
358 358 
 				return 0, io.ErrUnexpectedEOF
359 359 
 			}
360 
-			b := data[iNdEx]
360 
+			b := dAtA[iNdEx]
361 361 
 			iNdEx++
362 362 
 			wire |= (uint64(b) & 0x7F) << shift
363 363 
 			if b < 0x80 {
... ... 
@@ -375,7 +359,7 @@ func skipOverlay(data []byte) (n int, err error) {
375 375 
 					return 0, io.ErrUnexpectedEOF
376 376 
 				}
377 377 
 				iNdEx++
378 
-				if data[iNdEx-1] < 0x80 {
378 
+				if dAtA[iNdEx-1] < 0x80 {
379 379 
 					break
380 380 
 				}
381 381 
 			}
... ... 
@@ -392,7 +376,7 @@ func skipOverlay(data []byte) (n int, err error) {
392 392 
 				if iNdEx >= l {
393 393 
 					return 0, io.ErrUnexpectedEOF
394 394 
 				}
395 
-				b := data[iNdEx]
395 
+				b := dAtA[iNdEx]
396 396 
 				iNdEx++
397 397 
 				length |= (int(b) & 0x7F) << shift
398 398 
 				if b < 0x80 {
... ... 
@@ -415,7 +399,7 @@ func skipOverlay(data []byte) (n int, err error) {
415 415 
 					if iNdEx >= l {
416 416 
 						return 0, io.ErrUnexpectedEOF
417 417 
 					}
418 
-					b := data[iNdEx]
418 
+					b := dAtA[iNdEx]
419 419 
 					iNdEx++
420 420 
 					innerWire |= (uint64(b) & 0x7F) << shift
421 421 
 					if b < 0x80 {
... ... 
@@ -426,7 +410,7 @@ func skipOverlay(data []byte) (n int, err error) {
426 426 
 				if innerWireType == 4 {
427 427 
 					break
428 428 
 				}
429 
-				next, err := skipOverlay(data[start:])
429 
+				next, err := skipOverlay(dAtA[start:])
430 430 
 				if err != nil {
431 431 
 					return 0, err
432 432 
 				}
... ... 
@@ -450,19 +434,22 @@ var (
450 450 
 	ErrIntOverflowOverlay   = fmt.Errorf("proto: integer overflow")
451 451 
 )
452 452
453 
+func init() { proto.RegisterFile("drivers/overlay/overlay.proto", fileDescriptorOverlay) }
454 
+
453 455 
 var fileDescriptorOverlay = []byte{
454 
-	// 195 bytes of a gzipped FileDescriptorProto
455 
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0xcd, 0x2f, 0x4b, 0x2d,
456 
-	0xca, 0x49, 0xac, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x72, 0xa5, 0x44, 0xd2,
457 
-	0xf3, 0xd3, 0xf3, 0xc1, 0x62, 0xfa, 0x20, 0x16, 0x44, 0x5a, 0x69, 0x2b, 0x23, 0x17, 0x57, 0x40,
458 
-	0x6a, 0x6a, 0x51, 0x50, 0x6a, 0x72, 0x7e, 0x51, 0x8a, 0x90, 0x3e, 0x17, 0x77, 0x6a, 0x5e, 0x4a,
459 
-	0x41, 0x7e, 0x66, 0x5e, 0x49, 0x7c, 0x66, 0x81, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x13, 0xdf,
460 
-	0xa3, 0x7b, 0xf2, 0x5c, 0xae, 0x50, 0x61, 0xcf, 0x80, 0x20, 0x2e, 0x98, 0x12, 0xcf, 0x02, 0x21,
461 
-	0x23, 0x2e, 0x1e, 0xb8, 0x86, 0xdc, 0xc4, 0x64, 0x09, 0x26, 0xb0, 0x0e, 0x7e, 0xa0, 0x0e, 0x6e,
462 
-	0x98, 0x0e, 0x5f, 0x47, 0xe7, 0x20, 0xb8, 0xa9, 0xbe, 0x89, 0xc9, 0x42, 0x4e, 0x5c, 0x42, 0x25,
463 
-	0xa5, 0x79, 0x79, 0xa9, 0x39, 0xf1, 0xc8, 0x76, 0x31, 0x83, 0x75, 0x8a, 0x00, 0x75, 0x0a, 0x84,
464 
-	0x80, 0x65, 0x91, 0x6c, 0x14, 0x28, 0x41, 0x15, 0x29, 0x70, 0x92, 0xb8, 0xf1, 0x50, 0x8e, 0xe1,
465 
-	0xc3, 0x43, 0x39, 0xc6, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x80, 0xf8, 0x02, 0x10, 0x3f, 0x00, 0xe2,
466 
-	0x24, 0x36, 0xb0, 0xc7, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xd7, 0x7d, 0x7d, 0x08,
467 
-	0x01, 0x00, 0x00,
456 
+	// 212 bytes of a gzipped FileDescriptorProto
457 
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4d, 0x29, 0xca, 0x2c,
458 
+	0x4b, 0x2d, 0x2a, 0xd6, 0xcf, 0x2f, 0x4b, 0x2d, 0xca, 0x49, 0xac, 0x84, 0xd1, 0x7a, 0x05, 0x45,
459 
+	0xf9, 0x25, 0xf9, 0x42, 0xec, 0x50, 0xae, 0x94, 0x48, 0x7a, 0x7e, 0x7a, 0x3e, 0x58, 0x4c, 0x1f,
460 
+	0xc4, 0x82, 0x48, 0x2b, 0x6d, 0x65, 0xe4, 0xe2, 0x0a, 0x48, 0x4d, 0x2d, 0x0a, 0x4a, 0x4d, 0xce,
461 
+	0x2f, 0x4a, 0x11, 0xd2, 0xe7, 0xe2, 0x4e, 0xcd, 0x4b, 0x29, 0xc8, 0xcf, 0xcc, 0x2b, 0x89, 0xcf,
462 
+	0x2c, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0xe2, 0x7b, 0x74, 0x4f, 0x9e, 0xcb, 0x15, 0x2a,
463 
+	0xec, 0x19, 0x10, 0xc4, 0x05, 0x53, 0xe2, 0x59, 0x20, 0x64, 0xc4, 0xc5, 0x03, 0xd7, 0x90, 0x9b,
464 
+	0x98, 0x2c, 0xc1, 0x04, 0xd6, 0xc1, 0xff, 0xe8, 0x9e, 0x3c, 0x37, 0x4c, 0x87, 0xaf, 0xa3, 0x73,
465 
+	0x10, 0xdc, 0x54, 0xdf, 0xc4, 0x64, 0x21, 0x27, 0x2e, 0xa1, 0x92, 0xd2, 0xbc, 0xbc, 0xd4, 0x9c,
466 
+	0x78, 0x64, 0xbb, 0x98, 0xc1, 0x3a, 0x45, 0x1e, 0xdd, 0x93, 0x17, 0x08, 0x01, 0xcb, 0x22, 0xd9,
467 
+	0x28, 0x50, 0x82, 0x2a, 0x52, 0xe0, 0x24, 0x71, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c,
468 
+	0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39,
469 
+	0xc6, 0x24, 0x36, 0xb0, 0xc7, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x48, 0x07, 0xf6, 0xf3,
470 
+	0x18, 0x01, 0x00, 0x00,
468 471 
 }
libnetwork/drivers/windows/overlay/overlay.pb.go
History View file @ 96c7cba
... ... 
@@ -1,12 +1,11 @@
1 
-// Code generated by protoc-gen-gogo.
2 
-// source: overlay.proto
3 
-// DO NOT EDIT!
1 
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
2 
+// source: drivers/windows/overlay/overlay.proto
4 3
5 4 
 /*
6 5 
 	Package overlay is a generated protocol buffer package.
7 6
8 7 
 	It is generated from these files:
9 
-		overlay.proto
8 
+		drivers/windows/overlay/overlay.proto
10 9
11 10 
 	It has these top-level messages:
12 11 
 		PeerRecord
... ... 
@@ -19,9 +18,6 @@ import math "math"
19 19 
 import _ "github.com/gogo/protobuf/gogoproto"
20 20
21 21 
 import strings "strings"
22 
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
23 
-import sort "sort"
24 
-import strconv "strconv"
25 22 
 import reflect "reflect"
26 23
27 24 
 import io "io"
... ... 
@@ -33,7 +29,9 @@ var _ = math.Inf
33 33
34 34 
 // This is a compile-time assertion to ensure that this generated file
35 35 
 // is compatible with the proto package it is being compiled against.
36 
-const _ = proto.GoGoProtoPackageIsVersion1
36 
+// A compilation error at this line likely means your copy of the
37 
+// proto package needs to be updated.
38 
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
37 39
38 40 
 // PeerRecord defines the information corresponding to a peer
39 41 
 // container in the overlay network.
... ... 
@@ -54,6 +52,27 @@ func (m *PeerRecord) Reset()                    { *m = PeerRecord{} }
54 54 
 func (*PeerRecord) ProtoMessage()               {}
55 55 
 func (*PeerRecord) Descriptor() ([]byte, []int) { return fileDescriptorOverlay, []int{0} }
56 56
57 
+func (m *PeerRecord) GetEndpointIP() string {
58 
+	if m != nil {
59 
+		return m.EndpointIP
60 
+	}
61 
+	return ""
62 
+}
63 
+
64 
+func (m *PeerRecord) GetEndpointMAC() string {
65 
+	if m != nil {
66 
+		return m.EndpointMAC
67 
+	}
68 
+	return ""
69 
+}
70 
+
71 
+func (m *PeerRecord) GetTunnelEndpointIP() string {
72 
+	if m != nil {
73 
+		return m.TunnelEndpointIP
74 
+	}
75 
+	return ""
76 
+}
77 
+
57 78 
 func init() {
58 79 
 	proto.RegisterType((*PeerRecord)(nil), "overlay.PeerRecord")
59 80 
 }
... ... 
@@ -77,84 +96,49 @@ func valueToGoStringOverlay(v interface{}, typ string) string {
77 77 
 	pv := reflect.Indirect(rv).Interface()
78 78 
 	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
79 79 
 }
80 
-func extensionToGoStringOverlay(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
81 
-	if e == nil {
82 
-		return "nil"
83 
-	}
84 
-	s := "map[int32]proto.Extension{"
85 
-	keys := make([]int, 0, len(e))
86 
-	for k := range e {
87 
-		keys = append(keys, int(k))
88 
-	}
89 
-	sort.Ints(keys)
90 
-	ss := []string{}
91 
-	for _, k := range keys {
92 
-		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
93 
-	}
94 
-	s += strings.Join(ss, ",") + "}"
95 
-	return s
96 
-}
97 
-func (m *PeerRecord) Marshal() (data []byte, err error) {
80 
+func (m *PeerRecord) Marshal() (dAtA []byte, err error) {
98 81 
 	size := m.Size()
99 
-	data = make([]byte, size)
100 
-	n, err := m.MarshalTo(data)
82 
+	dAtA = make([]byte, size)
83 
+	n, err := m.MarshalTo(dAtA)
101 84 
 	if err != nil {
102 85 
 		return nil, err
103 86 
 	}
104 
-	return data[:n], nil
87 
+	return dAtA[:n], nil
105 88 
 }
106 89
107 
-func (m *PeerRecord) MarshalTo(data []byte) (int, error) {
90 
+func (m *PeerRecord) MarshalTo(dAtA []byte) (int, error) {
108 91 
 	var i int
109 92 
 	_ = i
110 93 
 	var l int
111 94 
 	_ = l
112 95 
 	if len(m.EndpointIP) > 0 {
113 
-		data[i] = 0xa
96 
+		dAtA[i] = 0xa
114 97 
 		i++
115 
-		i = encodeVarintOverlay(data, i, uint64(len(m.EndpointIP)))
116 
-		i += copy(data[i:], m.EndpointIP)
98 
+		i = encodeVarintOverlay(dAtA, i, uint64(len(m.EndpointIP)))
99 
+		i += copy(dAtA[i:], m.EndpointIP)
117 100 
 	}
118 101 
 	if len(m.EndpointMAC) > 0 {
119 
-		data[i] = 0x12
102 
+		dAtA[i] = 0x12
120 103 
 		i++
121 
-		i = encodeVarintOverlay(data, i, uint64(len(m.EndpointMAC)))
122 
-		i += copy(data[i:], m.EndpointMAC)
104 
+		i = encodeVarintOverlay(dAtA, i, uint64(len(m.EndpointMAC)))
105 
+		i += copy(dAtA[i:], m.EndpointMAC)
123 106 
 	}
124 107 
 	if len(m.TunnelEndpointIP) > 0 {
125 
-		data[i] = 0x1a
108 
+		dAtA[i] = 0x1a
126 109 
 		i++
127 
-		i = encodeVarintOverlay(data, i, uint64(len(m.TunnelEndpointIP)))
128 
-		i += copy(data[i:], m.TunnelEndpointIP)
110 
+		i = encodeVarintOverlay(dAtA, i, uint64(len(m.TunnelEndpointIP)))
111 
+		i += copy(dAtA[i:], m.TunnelEndpointIP)
129 112 
 	}
130 113 
 	return i, nil
131 114 
 }
132 115
133 
-func encodeFixed64Overlay(data []byte, offset int, v uint64) int {
134 
-	data[offset] = uint8(v)
135 
-	data[offset+1] = uint8(v >> 8)
136 
-	data[offset+2] = uint8(v >> 16)
137 
-	data[offset+3] = uint8(v >> 24)
138 
-	data[offset+4] = uint8(v >> 32)
139 
-	data[offset+5] = uint8(v >> 40)
140 
-	data[offset+6] = uint8(v >> 48)
141 
-	data[offset+7] = uint8(v >> 56)
142 
-	return offset + 8
143 
-}
144 
-func encodeFixed32Overlay(data []byte, offset int, v uint32) int {
145 
-	data[offset] = uint8(v)
146 
-	data[offset+1] = uint8(v >> 8)
147 
-	data[offset+2] = uint8(v >> 16)
148 
-	data[offset+3] = uint8(v >> 24)
149 
-	return offset + 4
150 
-}
151 
-func encodeVarintOverlay(data []byte, offset int, v uint64) int {
116 
+func encodeVarintOverlay(dAtA []byte, offset int, v uint64) int {
152 117 
 	for v >= 1<<7 {
153 
-		data[offset] = uint8(v&0x7f | 0x80)
118 
+		dAtA[offset] = uint8(v&0x7f | 0x80)
154 119 
 		v >>= 7
155 120 
 		offset++
156 121 
 	}
157 
-	data[offset] = uint8(v)
122 
+	dAtA[offset] = uint8(v)
158 123 
 	return offset + 1
159 124 
 }
160 125 
 func (m *PeerRecord) Size() (n int) {
... ... 
@@ -208,8 +192,8 @@ func valueToStringOverlay(v interface{}) string {
208 208 
 	pv := reflect.Indirect(rv).Interface()
209 209 
 	return fmt.Sprintf("*%v", pv)
210 210 
 }
211 
-func (m *PeerRecord) Unmarshal(data []byte) error {
212 
-	l := len(data)
211 
+func (m *PeerRecord) Unmarshal(dAtA []byte) error {
212 
+	l := len(dAtA)
213 213 
 	iNdEx := 0
214 214 
 	for iNdEx < l {
215 215 
 		preIndex := iNdEx
... ... 
@@ -221,7 +205,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
221 221 
 			if iNdEx >= l {
222 222 
 				return io.ErrUnexpectedEOF
223 223 
 			}
224 
-			b := data[iNdEx]
224 
+			b := dAtA[iNdEx]
225 225 
 			iNdEx++
226 226 
 			wire |= (uint64(b) & 0x7F) << shift
227 227 
 			if b < 0x80 {
... ... 
@@ -249,7 +233,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
249 249 
 				if iNdEx >= l {
250 250 
 					return io.ErrUnexpectedEOF
251 251 
 				}
252 
-				b := data[iNdEx]
252 
+				b := dAtA[iNdEx]
253 253 
 				iNdEx++
254 254 
 				stringLen |= (uint64(b) & 0x7F) << shift
255 255 
 				if b < 0x80 {
... ... 
@@ -264,7 +248,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
264 264 
 			if postIndex > l {
265 265 
 				return io.ErrUnexpectedEOF
266 266 
 			}
267 
-			m.EndpointIP = string(data[iNdEx:postIndex])
267 
+			m.EndpointIP = string(dAtA[iNdEx:postIndex])
268 268 
 			iNdEx = postIndex
269 269 
 		case 2:
270 270 
 			if wireType != 2 {
... ... 
@@ -278,7 +262,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
278 278 
 				if iNdEx >= l {
279 279 
 					return io.ErrUnexpectedEOF
280 280 
 				}
281 
-				b := data[iNdEx]
281 
+				b := dAtA[iNdEx]
282 282 
 				iNdEx++
283 283 
 				stringLen |= (uint64(b) & 0x7F) << shift
284 284 
 				if b < 0x80 {
... ... 
@@ -293,7 +277,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
293 293 
 			if postIndex > l {
294 294 
 				return io.ErrUnexpectedEOF
295 295 
 			}
296 
-			m.EndpointMAC = string(data[iNdEx:postIndex])
296 
+			m.EndpointMAC = string(dAtA[iNdEx:postIndex])
297 297 
 			iNdEx = postIndex
298 298 
 		case 3:
299 299 
 			if wireType != 2 {
... ... 
@@ -307,7 +291,7 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
307 307 
 				if iNdEx >= l {
308 308 
 					return io.ErrUnexpectedEOF
309 309 
 				}
310 
-				b := data[iNdEx]
310 
+				b := dAtA[iNdEx]
311 311 
 				iNdEx++
312 312 
 				stringLen |= (uint64(b) & 0x7F) << shift
313 313 
 				if b < 0x80 {
... ... 
@@ -322,11 +306,11 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
322 322 
 			if postIndex > l {
323 323 
 				return io.ErrUnexpectedEOF
324 324 
 			}
325 
-			m.TunnelEndpointIP = string(data[iNdEx:postIndex])
325 
+			m.TunnelEndpointIP = string(dAtA[iNdEx:postIndex])
326 326 
 			iNdEx = postIndex
327 327 
 		default:
328 328 
 			iNdEx = preIndex
329 
-			skippy, err := skipOverlay(data[iNdEx:])
329 
+			skippy, err := skipOverlay(dAtA[iNdEx:])
330 330 
 			if err != nil {
331 331 
 				return err
332 332 
 			}
... ... 
@@ -345,8 +329,8 @@ func (m *PeerRecord) Unmarshal(data []byte) error {
345 345 
 	}
346 346 
 	return nil
347 347 
 }
348 
-func skipOverlay(data []byte) (n int, err error) {
349 
-	l := len(data)
348 
+func skipOverlay(dAtA []byte) (n int, err error) {
349 
+	l := len(dAtA)
350 350 
 	iNdEx := 0
351 351 
 	for iNdEx < l {
352 352 
 		var wire uint64
... ... 
@@ -357,7 +341,7 @@ func skipOverlay(data []byte) (n int, err error) {
357 357 
 			if iNdEx >= l {
358 358 
 				return 0, io.ErrUnexpectedEOF
359 359 
 			}
360 
-			b := data[iNdEx]
360 
+			b := dAtA[iNdEx]
361 361 
 			iNdEx++
362 362 
 			wire |= (uint64(b) & 0x7F) << shift
363 363 
 			if b < 0x80 {
... ... 
@@ -375,7 +359,7 @@ func skipOverlay(data []byte) (n int, err error) {
375 375 
 					return 0, io.ErrUnexpectedEOF
376 376 
 				}
377 377 
 				iNdEx++
378 
-				if data[iNdEx-1] < 0x80 {
378 
+				if dAtA[iNdEx-1] < 0x80 {
379 379 
 					break
380 380 
 				}
381 381 
 			}
... ... 
@@ -392,7 +376,7 @@ func skipOverlay(data []byte) (n int, err error) {
392 392 
 				if iNdEx >= l {
393 393 
 					return 0, io.ErrUnexpectedEOF
394 394 
 				}
395 
-				b := data[iNdEx]
395 
+				b := dAtA[iNdEx]
396 396 
 				iNdEx++
397 397 
 				length |= (int(b) & 0x7F) << shift
398 398 
 				if b < 0x80 {
... ... 
@@ -415,7 +399,7 @@ func skipOverlay(data []byte) (n int, err error) {
415 415 
 					if iNdEx >= l {
416 416 
 						return 0, io.ErrUnexpectedEOF
417 417 
 					}
418 
-					b := data[iNdEx]
418 
+					b := dAtA[iNdEx]
419 419 
 					iNdEx++
420 420 
 					innerWire |= (uint64(b) & 0x7F) << shift
421 421 
 					if b < 0x80 {
... ... 
@@ -426,7 +410,7 @@ func skipOverlay(data []byte) (n int, err error) {
426 426 
 				if innerWireType == 4 {
427 427 
 					break
428 428 
 				}
429 
-				next, err := skipOverlay(data[start:])
429 
+				next, err := skipOverlay(dAtA[start:])
430 430 
 				if err != nil {
431 431 
 					return 0, err
432 432 
 				}
... ... 
@@ -450,19 +434,22 @@ var (
450 450 
 	ErrIntOverflowOverlay   = fmt.Errorf("proto: integer overflow")
451 451 
 )
452 452
453 
+func init() { proto.RegisterFile("drivers/windows/overlay/overlay.proto", fileDescriptorOverlay) }
454 
+
453 455 
 var fileDescriptorOverlay = []byte{
454 
-	// 195 bytes of a gzipped FileDescriptorProto
455 
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0xcd, 0x2f, 0x4b, 0x2d,
456 
-	0xca, 0x49, 0xac, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x72, 0xa5, 0x44, 0xd2,
457 
-	0xf3, 0xd3, 0xf3, 0xc1, 0x62, 0xfa, 0x20, 0x16, 0x44, 0x5a, 0x69, 0x2b, 0x23, 0x17, 0x57, 0x40,
458 
-	0x6a, 0x6a, 0x51, 0x50, 0x6a, 0x72, 0x7e, 0x51, 0x8a, 0x90, 0x3e, 0x17, 0x77, 0x6a, 0x5e, 0x4a,
459 
-	0x41, 0x7e, 0x66, 0x5e, 0x49, 0x7c, 0x66, 0x81, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x13, 0xdf,
460 
-	0xa3, 0x7b, 0xf2, 0x5c, 0xae, 0x50, 0x61, 0xcf, 0x80, 0x20, 0x2e, 0x98, 0x12, 0xcf, 0x02, 0x21,
461 
-	0x23, 0x2e, 0x1e, 0xb8, 0x86, 0xdc, 0xc4, 0x64, 0x09, 0x26, 0xb0, 0x0e, 0x7e, 0xa0, 0x0e, 0x6e,
462 
-	0x98, 0x0e, 0x5f, 0x47, 0xe7, 0x20, 0xb8, 0xa9, 0xbe, 0x89, 0xc9, 0x42, 0x4e, 0x5c, 0x42, 0x25,
463 
-	0xa5, 0x79, 0x79, 0xa9, 0x39, 0xf1, 0xc8, 0x76, 0x31, 0x83, 0x75, 0x8a, 0x00, 0x75, 0x0a, 0x84,
464 
-	0x80, 0x65, 0x91, 0x6c, 0x14, 0x28, 0x41, 0x15, 0x29, 0x70, 0x92, 0xb8, 0xf1, 0x50, 0x8e, 0xe1,
465 
-	0xc3, 0x43, 0x39, 0xc6, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x80, 0xf8, 0x02, 0x10, 0x3f, 0x00, 0xe2,
466 
-	0x24, 0x36, 0xb0, 0xc7, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xd7, 0x7d, 0x7d, 0x08,
467 
-	0x01, 0x00, 0x00,
456 
+	// 220 bytes of a gzipped FileDescriptorProto
457 
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4d, 0x29, 0xca, 0x2c,
458 
+	0x4b, 0x2d, 0x2a, 0xd6, 0x2f, 0xcf, 0xcc, 0x4b, 0xc9, 0x2f, 0x2f, 0xd6, 0xcf, 0x2f, 0x4b, 0x2d,
459 
+	0xca, 0x49, 0xac, 0x84, 0xd1, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xec, 0x50, 0xae, 0x94,
460 
+	0x48, 0x7a, 0x7e, 0x7a, 0x3e, 0x58, 0x4c, 0x1f, 0xc4, 0x82, 0x48, 0x2b, 0x6d, 0x65, 0xe4, 0xe2,
461 
+	0x0a, 0x48, 0x4d, 0x2d, 0x0a, 0x4a, 0x4d, 0xce, 0x2f, 0x4a, 0x11, 0xd2, 0xe7, 0xe2, 0x4e, 0xcd,
462 
+	0x4b, 0x29, 0xc8, 0xcf, 0xcc, 0x2b, 0x89, 0xcf, 0x2c, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74,
463 
+	0xe2, 0x7b, 0x74, 0x4f, 0x9e, 0xcb, 0x15, 0x2a, 0xec, 0x19, 0x10, 0xc4, 0x05, 0x53, 0xe2, 0x59,
464 
+	0x20, 0x64, 0xc4, 0xc5, 0x03, 0xd7, 0x90, 0x9b, 0x98, 0x2c, 0xc1, 0x04, 0xd6, 0xc1, 0xff, 0xe8,
465 
+	0x9e, 0x3c, 0x37, 0x4c, 0x87, 0xaf, 0xa3, 0x73, 0x10, 0xdc, 0x54, 0xdf, 0xc4, 0x64, 0x21, 0x27,
466 
+	0x2e, 0xa1, 0x92, 0xd2, 0xbc, 0xbc, 0xd4, 0x9c, 0x78, 0x64, 0xbb, 0x98, 0xc1, 0x3a, 0x45, 0x1e,
467 
+	0xdd, 0x93, 0x17, 0x08, 0x01, 0xcb, 0x22, 0xd9, 0x28, 0x50, 0x82, 0x2a, 0x52, 0xe0, 0x24, 0x71,
468 
+	0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63,
469 
+	0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x24, 0x36, 0xb0, 0xc7, 0x8c, 0x01, 0x01,
470 
+	0x00, 0x00, 0xff, 0xff, 0xc0, 0x48, 0xd1, 0xc0, 0x20, 0x01, 0x00, 0x00,
468 471 
 }
libnetwork/networkdb/networkdb.pb.go
History View file @ 96c7cba
... ... 
@@ -1,11 +1,11 @@
1 1 
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
2 
-// source: networkdb.proto
2 
+// source: networkdb/networkdb.proto
3 3
4 4 
 /*
5 5 
 	Package networkdb is a generated protocol buffer package.
6 6
7 7 
 	It is generated from these files:
8 
-		networkdb.proto
8 
+		networkdb/networkdb.proto
9 9
10 10 
 	It has these top-level messages:
11 11 
 		GossipMessage
... ... 
@@ -476,7 +476,7 @@ func (m *CompoundMessage) GetMessages() []*CompoundMessage_SimpleMessage {
476 476 
 type CompoundMessage_SimpleMessage struct {
477 477 
 	// Bytestring payload of a message constructed using
478 478 
 	// other message type definitions.
479 
-	Payload []byte `protobuf:"bytes,1,opt,name=Payload,proto3" json:"Payload,omitempty"`
479 
+	Payload []byte `protobuf:"bytes,1,opt,name=Payload,json=payload,proto3" json:"Payload,omitempty"`
480 480 
 }
481 481
482 482 
 func (m *CompoundMessage_SimpleMessage) Reset()      { *m = CompoundMessage_SimpleMessage{} }
... ... 
@@ -997,24 +997,6 @@ func (m *CompoundMessage_SimpleMessage) MarshalTo(dAtA []byte) (int, error) {
997 997 
 	return i, nil
998 998 
 }
999 999
1000 
-func encodeFixed64Networkdb(dAtA []byte, offset int, v uint64) int {
1001 
-	dAtA[offset] = uint8(v)
1002 
-	dAtA[offset+1] = uint8(v >> 8)
1003 
-	dAtA[offset+2] = uint8(v >> 16)
1004 
-	dAtA[offset+3] = uint8(v >> 24)
1005 
-	dAtA[offset+4] = uint8(v >> 32)
1006 
-	dAtA[offset+5] = uint8(v >> 40)
1007 
-	dAtA[offset+6] = uint8(v >> 48)
1008 
-	dAtA[offset+7] = uint8(v >> 56)
1009 
-	return offset + 8
1010 
-}
1011 
-func encodeFixed32Networkdb(dAtA []byte, offset int, v uint32) int {
1012 
-	dAtA[offset] = uint8(v)
1013 
-	dAtA[offset+1] = uint8(v >> 8)
1014 
-	dAtA[offset+2] = uint8(v >> 16)
1015 
-	dAtA[offset+3] = uint8(v >> 24)
1016 
-	return offset + 4
1017 
-}
1018 1000 
 func encodeVarintNetworkdb(dAtA []byte, offset int, v uint64) int {
1019 1001 
 	for v >= 1<<7 {
1020 1002 
 		dAtA[offset] = uint8(v&0x7f | 0x80)
... ... 
@@ -2666,68 +2648,68 @@ var (
2666 2666 
 	ErrIntOverflowNetworkdb   = fmt.Errorf("proto: integer overflow")
2667 2667 
 )
2668 2668
2669 
-func init() { proto.RegisterFile("networkdb.proto", fileDescriptorNetworkdb) }
2669 
+func init() { proto.RegisterFile("networkdb/networkdb.proto", fileDescriptorNetworkdb) }
2670 2670
2671 2671 
 var fileDescriptorNetworkdb = []byte{
2672 
-	// 953 bytes of a gzipped FileDescriptorProto
2672 
+	// 955 bytes of a gzipped FileDescriptorProto
2673 2673 
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0xcd, 0x6e, 0xe3, 0x54,
2674 
-	0x14, 0xc7, 0x7b, 0xf3, 0xd5, 0xe4, 0x34, 0xa5, 0xe6, 0x4e, 0x67, 0xc6, 0xe3, 0x81, 0xc4, 0x98,
2675 
-	0x99, 0x2a, 0x53, 0x41, 0x8a, 0x3a, 0x4f, 0xd0, 0x24, 0x16, 0x64, 0x26, 0xe3, 0x44, 0x6e, 0x52,
2676 
-	0xc4, 0x2a, 0xba, 0xad, 0x2f, 0xa9, 0x55, 0xc7, 0xb6, 0x6c, 0x27, 0x28, 0x2b, 0x10, 0xab, 0x51,
2677 
-	0x16, 0xbc, 0x41, 0x56, 0xc3, 0x9a, 0x07, 0x40, 0x2c, 0x59, 0xcc, 0x82, 0x05, 0xec, 0x10, 0x8b,
2678 
-	0x88, 0xe6, 0x09, 0x78, 0x04, 0xe4, 0x6b, 0x3b, 0xb9, 0x49, 0xab, 0x91, 0x10, 0x23, 0xc1, 0x26,
2679 
-	0xb9, 0x1f, 0xbf, 0x1c, 0x9f, 0xf3, 0xf7, 0xff, 0xdc, 0x1b, 0xd8, 0xb3, 0x69, 0xf0, 0x95, 0xe3,
2680 
-	0x5d, 0x19, 0xe7, 0x55, 0xd7, 0x73, 0x02, 0x07, 0x17, 0x96, 0x0b, 0xd2, 0xfe, 0xc0, 0x19, 0x38,
2681 
-	0x6c, 0xf5, 0x28, 0x1c, 0x45, 0x80, 0xd2, 0x86, 0xdd, 0x4f, 0x1d, 0xdf, 0x37, 0xdd, 0x17, 0xd4,
2682 
-	0xf7, 0xc9, 0x80, 0xe2, 0x43, 0xc8, 0x04, 0x13, 0x97, 0x8a, 0x48, 0x46, 0x95, 0x77, 0x8e, 0xef,
2683 
-	0x55, 0x57, 0x11, 0x63, 0xa2, 0x3b, 0x71, 0xa9, 0xce, 0x18, 0x8c, 0x21, 0x63, 0x90, 0x80, 0x88,
2684 
-	0x29, 0x19, 0x55, 0x8a, 0x3a, 0x1b, 0x2b, 0xaf, 0x52, 0x50, 0xd0, 0x1c, 0x83, 0xaa, 0x63, 0x6a,
2685 
-	0x07, 0xf8, 0xe3, 0xb5, 0x68, 0x0f, 0xb8, 0x68, 0x4b, 0xa6, 0xca, 0x05, 0x6c, 0x42, 0xce, 0xea,
2686 
-	0x07, 0xe6, 0x90, 0xb2, 0x90, 0x99, 0xda, 0xf1, 0xeb, 0x79, 0x79, 0xeb, 0x8f, 0x79, 0xf9, 0x70,
2687 
-	0x60, 0x06, 0x97, 0xa3, 0xf3, 0xea, 0x85, 0x33, 0x3c, 0xba, 0x24, 0xfe, 0xa5, 0x79, 0xe1, 0x78,
2688 
-	0xee, 0x91, 0x4f, 0xbd, 0x2f, 0xd9, 0x47, 0xb5, 0x45, 0x86, 0xae, 0xe3, 0x05, 0x5d, 0x73, 0x48,
2689 
-	0xf5, 0xac, 0x15, 0x7e, 0xe1, 0x87, 0x50, 0xb0, 0x1d, 0x83, 0xf6, 0x6d, 0x32, 0xa4, 0x62, 0x5a,
2690 
-	0x46, 0x95, 0x82, 0x9e, 0x0f, 0x17, 0x34, 0x32, 0xa4, 0xca, 0xd7, 0x90, 0x09, 0x9f, 0x8a, 0x1f,
2691 
-	0xc3, 0x76, 0x53, 0x3b, 0x3b, 0x69, 0x35, 0x1b, 0xc2, 0x96, 0x24, 0x4e, 0x67, 0xf2, 0xfe, 0x32,
2692 
-	0xad, 0x70, 0xbf, 0x69, 0x8f, 0x89, 0x65, 0x1a, 0xb8, 0x0c, 0x99, 0x67, 0xed, 0xa6, 0x26, 0x20,
2693 
-	0xe9, 0xee, 0x74, 0x26, 0xbf, 0xbb, 0xc6, 0x3c, 0x73, 0x4c, 0x1b, 0x7f, 0x00, 0xd9, 0x96, 0x7a,
2694 
-	0x72, 0xa6, 0x0a, 0x29, 0xe9, 0xde, 0x74, 0x26, 0xe3, 0x35, 0xa2, 0x45, 0xc9, 0x98, 0x4a, 0xc5,
2695 
-	0x97, 0xaf, 0x4a, 0x5b, 0x3f, 0x7e, 0x5f, 0x62, 0x0f, 0x56, 0xae, 0x53, 0x50, 0xd4, 0x22, 0x2d,
2696 
-	0x22, 0xa1, 0x3e, 0x59, 0x13, 0xea, 0x3d, 0x5e, 0x28, 0x0e, 0xfb, 0x0f, 0xb4, 0xc2, 0x1f, 0x01,
2697 
-	0xc4, 0xc9, 0xf4, 0x4d, 0x43, 0xcc, 0x84, 0xbb, 0xb5, 0xdd, 0xc5, 0xbc, 0x5c, 0x88, 0x13, 0x6b,
2698 
-	0x36, 0xf4, 0xc4, 0x65, 0x4d, 0x43, 0x79, 0x89, 0x62, 0x69, 0x2b, 0xbc, 0xb4, 0x0f, 0xa7, 0x33,
2699 
-	0xf9, 0x3e, 0x5f, 0x08, 0xaf, 0xae, 0xb2, 0x54, 0x37, 0x7a, 0x03, 0x1b, 0x18, 0x13, 0xf8, 0xd1,
2700 
-	0x4a, 0xe0, 0x07, 0xd3, 0x99, 0x7c, 0x77, 0x13, 0xba, 0x4d, 0xe3, 0x5f, 0xd0, 0x4a, 0x63, 0x3b,
2701 
-	0xf0, 0x26, 0x1b, 0x95, 0xa0, 0x37, 0x57, 0xf2, 0x36, 0xf5, 0x7d, 0x72, 0x43, 0xdf, 0x5a, 0x71,
2702 
-	0x31, 0x2f, 0xe7, 0xb5, 0x58, 0x63, 0x4e, 0x6d, 0x11, 0xb6, 0x2d, 0x4a, 0xc6, 0xa6, 0x3d, 0x60,
2703 
-	0x52, 0xe7, 0xf5, 0x64, 0xaa, 0xfc, 0x84, 0x60, 0x2f, 0x4e, 0xb4, 0x33, 0xf2, 0x2f, 0x3b, 0x23,
2704 
-	0xcb, 0xe2, 0x72, 0x44, 0xff, 0x36, 0xc7, 0xa7, 0x90, 0x8f, 0x6b, 0xf7, 0xc5, 0x94, 0x9c, 0xae,
2705 
-	0xec, 0x1c, 0xdf, 0xbf, 0xc5, 0x84, 0xa1, 0x8e, 0xfa, 0x12, 0xfc, 0x07, 0x85, 0x29, 0xdf, 0x65,
2706 
-	0x00, 0xba, 0xe4, 0xdc, 0x8a, 0x0f, 0x86, 0xea, 0x9a, 0xdf, 0x25, 0xee, 0x51, 0x2b, 0xe8, 0x7f,
2707 
-	0xef, 0x76, 0xfc, 0x3e, 0x40, 0x10, 0xa6, 0x1b, 0xc5, 0xca, 0xb2, 0x58, 0x05, 0xb6, 0xc2, 0x82,
2708 
-	0x09, 0x90, 0xbe, 0xa2, 0x13, 0x31, 0xc7, 0xd6, 0xc3, 0x21, 0xde, 0x87, 0xec, 0x98, 0x58, 0x23,
2709 
-	0x2a, 0x6e, 0xb3, 0x23, 0x33, 0x9a, 0xe0, 0x1a, 0x60, 0x8f, 0xfa, 0xa6, 0x31, 0x22, 0x56, 0xdf,
2710 
-	0xa3, 0xc4, 0x8d, 0x0a, 0xcd, 0xcb, 0xa8, 0x92, 0xad, 0xed, 0x2f, 0xe6, 0x65, 0x41, 0x8f, 0x77,
2711 
-	0x75, 0x4a, 0x5c, 0x56, 0x8a, 0xe0, 0x6d, 0xac, 0x28, 0x3f, 0x24, 0x8d, 0x77, 0xc0, 0x37, 0x1e,
2712 
-	0x6b, 0x96, 0x95, 0xa2, 0x7c, 0xdb, 0x3d, 0x82, 0x5c, 0x5d, 0x57, 0x4f, 0xba, 0x6a, 0xd2, 0x78,
2713 
-	0xeb, 0x58, 0xdd, 0xa3, 0x24, 0xa0, 0x21, 0xd5, 0xeb, 0x34, 0x42, 0x2a, 0x75, 0x1b, 0xd5, 0x73,
2714 
-	0x8d, 0x98, 0x6a, 0xa8, 0x2d, 0xb5, 0xab, 0x0a, 0xe9, 0xdb, 0xa8, 0x06, 0xb5, 0x68, 0xb0, 0xd9,
2715 
-	0x9e, 0xbf, 0x21, 0xd8, 0xab, 0x8d, 0xac, 0xab, 0xd3, 0x89, 0x7d, 0x91, 0x5c, 0x3e, 0x6f, 0xd1,
2716 
-	0xcf, 0x32, 0xec, 0x8c, 0x6c, 0xdf, 0xb1, 0xcc, 0x0b, 0x33, 0xa0, 0x06, 0x73, 0x4d, 0x5e, 0xe7,
2717 
-	0x97, 0xde, 0xec, 0x03, 0x89, 0x6b, 0x87, 0x8c, 0x9c, 0x66, 0x7b, 0x89, 0xeb, 0x45, 0xd8, 0x76,
2718 
-	0xc9, 0xc4, 0x72, 0x88, 0xc1, 0x5e, 0x79, 0x51, 0x4f, 0xa6, 0xca, 0xb7, 0x08, 0xf6, 0xea, 0xce,
2719 
-	0xd0, 0x75, 0x46, 0xb6, 0x91, 0xd4, 0xd4, 0x80, 0xfc, 0x30, 0x1a, 0xfa, 0x22, 0x62, 0x8d, 0x55,
2720 
-	0xe1, 0xdc, 0xbe, 0x41, 0x57, 0x4f, 0xcd, 0xa1, 0x6b, 0xd1, 0x78, 0xa6, 0x2f, 0x7f, 0x29, 0x3d,
2721 
-	0x81, 0xdd, 0xb5, 0xad, 0x30, 0x89, 0x4e, 0x9c, 0x04, 0x8a, 0x92, 0x88, 0xa7, 0x87, 0x3f, 0xa7,
2722 
-	0x60, 0x87, 0xbb, 0xab, 0xf1, 0x87, 0xbc, 0x21, 0xd8, 0xf5, 0xc4, 0xed, 0x26, 0x6e, 0xa8, 0xc2,
2723 
-	0xae, 0xa6, 0x76, 0x3f, 0x6f, 0xeb, 0xcf, 0xfb, 0xea, 0x99, 0xaa, 0x75, 0x05, 0x14, 0x1d, 0xda,
2724 
-	0x1c, 0xba, 0x76, 0x5f, 0x1d, 0xc2, 0x4e, 0xf7, 0xa4, 0xd6, 0x52, 0x63, 0x3a, 0x3e, 0x96, 0x39,
2725 
-	0x9a, 0xeb, 0xf5, 0x03, 0x28, 0x74, 0x7a, 0xa7, 0x9f, 0xf5, 0x3b, 0xbd, 0x56, 0x4b, 0x48, 0x4b,
2726 
-	0xf7, 0xa7, 0x33, 0xf9, 0x0e, 0x47, 0x2e, 0x4f, 0xb3, 0x03, 0x28, 0xd4, 0x7a, 0xad, 0xe7, 0xfd,
2727 
-	0xd3, 0x2f, 0xb4, 0xba, 0x90, 0xb9, 0xc1, 0x25, 0x66, 0xc1, 0x8f, 0x21, 0x5f, 0x6f, 0xbf, 0xe8,
2728 
-	0xb4, 0x7b, 0x5a, 0x43, 0xc8, 0xde, 0xc0, 0x12, 0x45, 0x71, 0x05, 0x40, 0x6b, 0x37, 0x92, 0x0c,
2729 
-	0x73, 0x91, 0x31, 0xf9, 0x7a, 0x92, 0x4b, 0x5a, 0xba, 0x13, 0x1b, 0x93, 0x97, 0xad, 0x26, 0xfe,
2730 
-	0x7e, 0x5d, 0xda, 0xfa, 0xeb, 0xba, 0x84, 0xbe, 0x59, 0x94, 0xd0, 0xeb, 0x45, 0x09, 0xfd, 0xba,
2731 
-	0x28, 0xa1, 0x3f, 0x17, 0x25, 0x74, 0x9e, 0x63, 0x7f, 0x9d, 0x9e, 0xfe, 0x1d, 0x00, 0x00, 0xff,
2732 
-	0xff, 0x92, 0x82, 0xdb, 0x1a, 0x6e, 0x09, 0x00, 0x00,
2674 
+	0x14, 0xc7, 0x7b, 0xf3, 0xd1, 0x26, 0xa7, 0x29, 0x35, 0x77, 0x3a, 0x53, 0xd7, 0x03, 0x89, 0x31,
2675 
+	0x33, 0x55, 0xa6, 0x82, 0x14, 0x75, 0x9e, 0xa0, 0x49, 0x2c, 0xc8, 0x4c, 0xc6, 0x89, 0xdc, 0xa4,
2676 
+	0x88, 0x55, 0x74, 0x5b, 0x5f, 0x52, 0xab, 0x8e, 0x6d, 0xd9, 0x4e, 0x50, 0x56, 0x20, 0x56, 0xa3,
2677 
+	0x2c, 0x78, 0x83, 0xac, 0x86, 0x35, 0x0f, 0x80, 0x58, 0xb2, 0x98, 0x05, 0x0b, 0xd8, 0x21, 0x16,
2678 
+	0x11, 0xcd, 0x13, 0xf0, 0x08, 0xc8, 0xd7, 0x76, 0x72, 0x93, 0x56, 0x23, 0x21, 0x46, 0x82, 0x4d,
2679 
+	0x72, 0x3f, 0x7e, 0x39, 0x3e, 0xe7, 0xef, 0xff, 0xb9, 0x37, 0x70, 0x60, 0xd3, 0xe0, 0x2b, 0xc7,
2680 
+	0xbb, 0x36, 0x2e, 0x8e, 0x17, 0xa3, 0x8a, 0xeb, 0x39, 0x81, 0x83, 0xf3, 0x8b, 0x05, 0x69, 0xaf,
2681 
+	0xef, 0xf4, 0x1d, 0xb6, 0x7a, 0x1c, 0x8e, 0x22, 0x40, 0x69, 0xc1, 0xce, 0xa7, 0x8e, 0xef, 0x9b,
2682 
+	0xee, 0x0b, 0xea, 0xfb, 0xa4, 0x4f, 0xf1, 0x11, 0x64, 0x82, 0xb1, 0x4b, 0x45, 0x24, 0xa3, 0xf2,
2683 
+	0x3b, 0x27, 0x0f, 0x2a, 0xcb, 0x88, 0x31, 0xd1, 0x19, 0xbb, 0x54, 0x67, 0x0c, 0xc6, 0x90, 0x31,
2684 
+	0x48, 0x40, 0xc4, 0x94, 0x8c, 0xca, 0x05, 0x9d, 0x8d, 0x95, 0x57, 0x29, 0xc8, 0x6b, 0x8e, 0x41,
2685 
+	0xd5, 0x11, 0xb5, 0x03, 0xfc, 0xf1, 0x4a, 0xb4, 0x03, 0x2e, 0xda, 0x82, 0xa9, 0x70, 0x01, 0x1b,
2686 
+	0xb0, 0x69, 0xf5, 0x02, 0x73, 0x40, 0x59, 0xc8, 0x4c, 0xf5, 0xe4, 0xf5, 0xac, 0xb4, 0xf1, 0xc7,
2687 
+	0xac, 0x74, 0xd4, 0x37, 0x83, 0xab, 0xe1, 0x45, 0xe5, 0xd2, 0x19, 0x1c, 0x5f, 0x11, 0xff, 0xca,
2688 
+	0xbc, 0x74, 0x3c, 0xf7, 0xd8, 0xa7, 0xde, 0x97, 0xec, 0xa3, 0xd2, 0x24, 0x03, 0xd7, 0xf1, 0x82,
2689 
+	0x8e, 0x39, 0xa0, 0x7a, 0xd6, 0x0a, 0xbf, 0xf0, 0x43, 0xc8, 0xdb, 0x8e, 0x41, 0x7b, 0x36, 0x19,
2690 
+	0x50, 0x31, 0x2d, 0xa3, 0x72, 0x5e, 0xcf, 0x85, 0x0b, 0x1a, 0x19, 0x50, 0xe5, 0x6b, 0xc8, 0x84,
2691 
+	0x4f, 0xc5, 0x8f, 0x61, 0xab, 0xa1, 0x9d, 0x9f, 0x36, 0x1b, 0x75, 0x61, 0x43, 0x12, 0x27, 0x53,
2692 
+	0x79, 0x6f, 0x91, 0x56, 0xb8, 0xdf, 0xb0, 0x47, 0xc4, 0x32, 0x0d, 0x5c, 0x82, 0xcc, 0xb3, 0x56,
2693 
+	0x43, 0x13, 0x90, 0x74, 0x7f, 0x32, 0x95, 0xdf, 0x5d, 0x61, 0x9e, 0x39, 0xa6, 0x8d, 0x3f, 0x80,
2694 
+	0x6c, 0x53, 0x3d, 0x3d, 0x57, 0x85, 0x94, 0xf4, 0x60, 0x32, 0x95, 0xf1, 0x0a, 0xd1, 0xa4, 0x64,
2695 
+	0x44, 0xa5, 0xc2, 0xcb, 0x57, 0xc5, 0x8d, 0x1f, 0xbf, 0x2f, 0xb2, 0x07, 0x2b, 0x37, 0x29, 0x28,
2696 
+	0x68, 0x91, 0x16, 0x91, 0x50, 0x9f, 0xac, 0x08, 0xf5, 0x1e, 0x2f, 0x14, 0x87, 0xfd, 0x07, 0x5a,
2697 
+	0xe1, 0x8f, 0x00, 0xe2, 0x64, 0x7a, 0xa6, 0x21, 0x66, 0xc2, 0xdd, 0xea, 0xce, 0x7c, 0x56, 0xca,
2698 
+	0xc7, 0x89, 0x35, 0xea, 0x7a, 0xe2, 0xb2, 0x86, 0xa1, 0xbc, 0x44, 0xb1, 0xb4, 0x65, 0x5e, 0xda,
2699 
+	0x87, 0x93, 0xa9, 0xbc, 0xcf, 0x17, 0xc2, 0xab, 0xab, 0x2c, 0xd4, 0x8d, 0xde, 0xc0, 0x1a, 0xc6,
2700 
+	0x04, 0x7e, 0xb4, 0x14, 0xf8, 0x60, 0x32, 0x95, 0xef, 0xaf, 0x43, 0x77, 0x69, 0xfc, 0x0b, 0x5a,
2701 
+	0x6a, 0x6c, 0x07, 0xde, 0x78, 0xad, 0x12, 0xf4, 0xe6, 0x4a, 0xde, 0xa6, 0xbe, 0x4f, 0x6e, 0xe9,
2702 
+	0x5b, 0x2d, 0xcc, 0x67, 0xa5, 0x9c, 0x16, 0x6b, 0xcc, 0xa9, 0x2d, 0xc2, 0x96, 0x45, 0xc9, 0xc8,
2703 
+	0xb4, 0xfb, 0x4c, 0xea, 0x9c, 0x9e, 0x4c, 0x95, 0x9f, 0x10, 0xec, 0xc6, 0x89, 0xb6, 0x87, 0xfe,
2704 
+	0x55, 0x7b, 0x68, 0x59, 0x5c, 0x8e, 0xe8, 0xdf, 0xe6, 0xf8, 0x14, 0x72, 0x71, 0xed, 0xbe, 0x98,
2705 
+	0x92, 0xd3, 0xe5, 0xed, 0x93, 0xfd, 0x3b, 0x4c, 0x18, 0xea, 0xa8, 0x2f, 0xc0, 0x7f, 0x50, 0x98,
2706 
+	0xf2, 0x5d, 0x06, 0xa0, 0x43, 0x2e, 0xac, 0xf8, 0x60, 0xa8, 0xac, 0xf8, 0x5d, 0xe2, 0x1e, 0xb5,
2707 
+	0x84, 0xfe, 0xf7, 0x6e, 0xc7, 0xef, 0x03, 0x04, 0x61, 0xba, 0x51, 0xac, 0x2c, 0x8b, 0x95, 0x67,
2708 
+	0x2b, 0x2c, 0x98, 0x00, 0xe9, 0x6b, 0x3a, 0x16, 0x37, 0xd9, 0x7a, 0x38, 0xc4, 0x7b, 0x90, 0x1d,
2709 
+	0x11, 0x6b, 0x48, 0xc5, 0x2d, 0x76, 0x64, 0x46, 0x13, 0x5c, 0x05, 0xec, 0x51, 0xdf, 0x34, 0x86,
2710 
+	0xc4, 0xea, 0x79, 0x94, 0xb8, 0x51, 0xa1, 0x39, 0x19, 0x95, 0xb3, 0xd5, 0xbd, 0xf9, 0xac, 0x24,
2711 
+	0xe8, 0xf1, 0xae, 0x4e, 0x89, 0xcb, 0x4a, 0x11, 0xbc, 0xb5, 0x15, 0xe5, 0x87, 0xa4, 0xf1, 0x0e,
2712 
+	0xf9, 0xc6, 0x63, 0xcd, 0xb2, 0x54, 0x94, 0x6f, 0xbb, 0x47, 0xb0, 0x59, 0xd3, 0xd5, 0xd3, 0x8e,
2713 
+	0x9a, 0x34, 0xde, 0x2a, 0x56, 0xf3, 0x28, 0x09, 0x68, 0x48, 0x75, 0xdb, 0xf5, 0x90, 0x4a, 0xdd,
2714 
+	0x45, 0x75, 0x5d, 0x23, 0xa6, 0xea, 0x6a, 0x53, 0xed, 0xa8, 0x42, 0xfa, 0x2e, 0xaa, 0x4e, 0x2d,
2715 
+	0x1a, 0xac, 0xb7, 0xe7, 0x6f, 0x08, 0x76, 0xab, 0x43, 0xeb, 0xfa, 0x6c, 0x6c, 0x5f, 0x26, 0x97,
2716 
+	0xcf, 0x5b, 0xf4, 0xb3, 0x0c, 0xdb, 0x43, 0xdb, 0x77, 0x2c, 0xf3, 0xd2, 0x0c, 0xa8, 0xc1, 0x5c,
2717 
+	0x93, 0xd3, 0xf9, 0xa5, 0x37, 0xfb, 0x40, 0xe2, 0xda, 0x21, 0x23, 0xa7, 0xd9, 0x5e, 0xe2, 0x7a,
2718 
+	0x11, 0xb6, 0x5c, 0x32, 0xb6, 0x1c, 0x62, 0xb0, 0x57, 0x5e, 0xd0, 0x93, 0xa9, 0xf2, 0x2d, 0x82,
2719 
+	0xdd, 0x9a, 0x33, 0x70, 0x9d, 0xa1, 0x6d, 0x24, 0x35, 0xd5, 0x21, 0x37, 0x88, 0x86, 0xbe, 0x88,
2720 
+	0x58, 0x63, 0x95, 0x39, 0xb7, 0xaf, 0xd1, 0x95, 0x33, 0x73, 0xe0, 0x5a, 0x34, 0x9e, 0xe9, 0x8b,
2721 
+	0x5f, 0x4a, 0x4f, 0x60, 0x67, 0x65, 0x2b, 0x4c, 0xa2, 0x1d, 0x27, 0x81, 0x56, 0x92, 0x38, 0xfa,
2722 
+	0x39, 0x05, 0xdb, 0xdc, 0x5d, 0x8d, 0x3f, 0xe4, 0x0d, 0xc1, 0xae, 0x27, 0x6e, 0x37, 0x71, 0x43,
2723 
+	0x05, 0x76, 0x34, 0xb5, 0xf3, 0x79, 0x4b, 0x7f, 0xde, 0x53, 0xcf, 0x55, 0xad, 0x23, 0xa0, 0xe8,
2724 
+	0xd0, 0xe6, 0xd0, 0x95, 0xfb, 0xea, 0x08, 0xb6, 0x3b, 0xa7, 0xd5, 0xa6, 0x1a, 0xd3, 0xf1, 0xb1,
2725 
+	0xcc, 0xd1, 0x5c, 0xaf, 0x1f, 0x42, 0xbe, 0xdd, 0x3d, 0xfb, 0xac, 0xd7, 0xee, 0x36, 0x9b, 0x42,
2726 
+	0x5a, 0xda, 0x9f, 0x4c, 0xe5, 0x7b, 0x1c, 0xb9, 0x38, 0xcd, 0x0e, 0x21, 0x5f, 0xed, 0x36, 0x9f,
2727 
+	0xf7, 0xce, 0xbe, 0xd0, 0x6a, 0x42, 0xe6, 0x16, 0x97, 0x98, 0x05, 0x3f, 0x86, 0x5c, 0xad, 0xf5,
2728 
+	0xa2, 0xdd, 0xea, 0x6a, 0x75, 0x21, 0x7b, 0x0b, 0x4b, 0x14, 0xc5, 0x65, 0x00, 0xad, 0x55, 0x4f,
2729 
+	0x32, 0xdc, 0x8c, 0x8c, 0xc9, 0xd7, 0x93, 0x5c, 0xd2, 0xd2, 0xbd, 0xd8, 0x98, 0xbc, 0x6c, 0x55,
2730 
+	0xf1, 0xf7, 0x9b, 0xe2, 0xc6, 0x5f, 0x37, 0x45, 0xf4, 0xcd, 0xbc, 0x88, 0x5e, 0xcf, 0x8b, 0xe8,
2731 
+	0xd7, 0x79, 0x11, 0xfd, 0x39, 0x2f, 0xa2, 0x8b, 0x4d, 0xf6, 0xd7, 0xe9, 0xe9, 0xdf, 0x01, 0x00,
2732 
+	0x00, 0xff, 0xff, 0x02, 0x9d, 0x53, 0x72, 0x78, 0x09, 0x00, 0x00,
2733 2733 
 }