Update dependency github.com/paultag/sniff

ref in Godeps.json does not exist
This commit is contained in:
Antoine Cotten 2017-07-28 00:09:57 +02:00
parent 3495bfb4ac
commit ba137f5e1d
No known key found for this signature in database
GPG key ID: EA06C9A94E2B3EA0
3 changed files with 26 additions and 33 deletions

2
Godeps/Godeps.json generated
View file

@ -210,7 +210,7 @@
}, },
{ {
"ImportPath": "github.com/paultag/sniff/parser", "ImportPath": "github.com/paultag/sniff/parser",
"Rev": "558797aed1e6daa735d8fada0b863b89d72dcfba" "Rev": "87325c3dddf408cfb71f5044873d34ac426d5a59"
}, },
{ {
"ImportPath": "github.com/pborman/uuid", "ImportPath": "github.com/pborman/uuid",

View file

@ -1,17 +1,13 @@
Permission is hereby granted, free of charge, to any person obtaining a Copyright 2017 Paul Tagliamonte
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in Licensed under the Apache License, Version 2.0 (the "License");
all copies or substantial portions of the Software. you may not use this file except in compliance with the License.
You may obtain a copy of the License at
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR http://www.apache.org/licenses/LICENSE-2.0
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL Unless required by applicable law or agreed to in writing, software
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER distributed under the License is distributed on an "AS IS" BASIS,
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER See the License for the specific language governing permissions and
DEALINGS IN THE SOFTWARE. limitations under the License.

View file

@ -1,22 +1,16 @@
/* {{{ Copyright (c) Paul R. Tagliamonte <paultag@debian.org>, 2015 /* {{{ Copyright 2017 Paul Tagliamonte
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Licensed under the Apache License, Version 2.0 (the "License");
* of this software and associated documentation files (the "Software"), to deal * you may not use this file except in compliance with the License.
* in the Software without restriction, including without limitation the rights * You may obtain a copy of the License at
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * http://www.apache.org/licenses/LICENSE-2.0
* all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * Unless required by applicable law or agreed to in writing, software
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * distributed under the License is distributed on an "AS IS" BASIS,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * See the License for the specific language governing permissions and
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * limitations under the License. }}} */
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. }}} */
package parser package parser
@ -82,10 +76,13 @@ func GetSNBlock(data []byte) ([]byte, error) {
} }
extensionLength := int((data[index] << 8) + data[index+1]) extensionLength := int((data[index] << 8) + data[index+1])
if extensionLength+2 > len(data) {
return []byte{}, fmt.Errorf("Extension looks bonkers")
}
data = data[2 : extensionLength+2] data = data[2 : extensionLength+2]
for { for {
if index+4 >= len(data) { if index+3 >= len(data) {
break break
} }
length := int((data[index+2] << 8) + data[index+3]) length := int((data[index+2] << 8) + data[index+3])