commit a501ef438acfb88bf822ea12e1fdd586e8e1baaf
parent 7843ea76385b27a34d4fe74d95a38a95c395491e
Author: Louis Burda <quent.burda@gmail.com>
Date: Thu, 8 Jul 2021 16:38:54 +0200
use usual random ids for modelname and solidname in havoc 15, various smaller fixes
Diffstat:
8 files changed, 336 insertions(+), 336 deletions(-)
diff --git a/checker/src/checker.py b/checker/src/checker.py
@@ -173,20 +173,22 @@ def leetify(clean: str) -> str:
return "".join([conv[c] if c in conv else c for c in out])
-def fakeid(havoc: bool = False) -> bytes:
+def fakeid(havoc: bool = False, minlen: int = 20, maxlen: int = 60) -> bytes:
if havoc:
- idlen = rand.randint(10, 40)
+ idlen = rand.randint(minlen, maxlen)
return bytes([rand.randint(32, 127) for i in range(idlen)])
else:
- words = []
- for i in range(rand.randint(2, 3)):
+ idstr = b""
+ while len(idstr) < minlen:
word = rand.choice(wordlist)
- words.append(leetify(word).encode() if randbool() else word.encode())
- return b"-".join(words)
+ if idstr != b"":
+ idstr += b"-"
+ idstr += leetify(word).encode() if randbool() else word.encode()
+ return idstr[:maxlen]
def fakeids(n: int, havoc: bool = False) -> list[bytes]:
- return [fakeid(havoc) for i in range(n)]
+ return [fakeid(havoc=havoc) for i in range(n)]
def approx_equal(f1: float, f2: float, precision: int = 2) -> bool:
@@ -1011,9 +1013,13 @@ async def havoc_fluff_upload(di: DependencyInjector) -> None:
if len(extra_models) == 0:
return
model = rand.choice(extra_models)
- modelname = os.path.basename(model).split("-")[0].encode()
- modelname += bytes([rand.choice(b"0123456789") for i in range(5)])
stlfile = open(model, "rb").read()
+ if model.endswith("-bin.stl"):
+ modelname = fakeid(minlen=15, maxlen=15)
+ stlfile = modelname + stlfile[15:] # replaces "OpenSCAD Model\n"
+ else:
+ modelname = fakeid()
+ stlfile = stlfile.replace(b"OpenSCAD_Model", modelname)
# Simple Upload
session = await di.get(Session)
diff --git a/checker/src/models/build.sh b/checker/src/models/build.sh
@@ -1,13 +1,13 @@
#!/bin/sh
gen() {
- output=$(openscad --export-format $1 $2 -o $3 2>&1)
+ output=$(openscad --export-format "$1" "$2" -o "$3" 2>&1)
if [ $? -ne 0 ]; then
echo "OPENSCAD LOG:"
echo "$output"
exit 1
fi
- size=$(($(cat $3 | wc -c)))
+ size=$(($(cat "$3" | wc -c)))
printf "GEN %-20s: " "$3"
if [ $size -ge 50000 ]; then
echo "skipped (too large)"
diff --git a/checker/src/models/syringe-ascii.stl b/checker/src/models/syringe-ascii.stl
@@ -839,60 +839,60 @@ solid OpenSCAD_Model
vertex 0.404508 -0.293892 61
endloop
endfacet
- facet normal 0 0 1
+ facet normal -0.587786 0.809016 0
outer loop
- vertex 0.404508 0.293892 91
- vertex 0.404508 -0.293892 91
- vertex 0.5 0 91
+ vertex -0.154508 0.475528 61
+ vertex -0.404508 0.293892 91
+ vertex -0.154508 0.475528 91
endloop
endfacet
- facet normal 0 0 1
+ facet normal -0.587786 0.809016 0
outer loop
- vertex 0.154508 0.475528 91
- vertex 0.404508 -0.293892 91
- vertex 0.404508 0.293892 91
+ vertex -0.404508 0.293892 91
+ vertex -0.154508 0.475528 61
+ vertex -0.404508 0.293892 61
endloop
endfacet
- facet normal 0 0 1
+ facet normal -0.951056 0.309019 0
outer loop
- vertex 0.154508 0.475528 91
- vertex 0.154508 -0.475528 91
- vertex 0.404508 -0.293892 91
+ vertex -0.5 0 61
+ vertex -0.404508 0.293892 91
+ vertex -0.404508 0.293892 61
endloop
endfacet
- facet normal -0 0 1
+ facet normal -0.951056 0.309019 0
outer loop
- vertex -0.154508 0.475528 91
- vertex 0.154508 -0.475528 91
- vertex 0.154508 0.475528 91
+ vertex -0.404508 0.293892 91
+ vertex -0.5 0 61
+ vertex -0.5 0 91
endloop
endfacet
- facet normal 0 0 1
+ facet normal 0.951056 -0.309019 0
outer loop
- vertex -0.154508 0.475528 91
- vertex -0.154508 -0.475528 91
- vertex 0.154508 -0.475528 91
+ vertex 0.404508 -0.293892 91
+ vertex 0.5 0 61
+ vertex 0.5 0 91
endloop
endfacet
- facet normal -0 0 1
+ facet normal 0.951056 -0.309019 0
outer loop
- vertex -0.404508 0.293892 91
- vertex -0.154508 -0.475528 91
- vertex -0.154508 0.475528 91
+ vertex 0.5 0 61
+ vertex 0.404508 -0.293892 91
+ vertex 0.404508 -0.293892 61
endloop
endfacet
- facet normal 0 0 1
+ facet normal 0 -1 0
outer loop
- vertex -0.404508 0.293892 91
- vertex -0.404508 -0.293892 91
+ vertex -0.154508 -0.475528 61
+ vertex 0.154508 -0.475528 91
vertex -0.154508 -0.475528 91
endloop
endfacet
- facet normal 0 -0 1
+ facet normal 0 -1 -0
outer loop
- vertex -0.404508 -0.293892 91
- vertex -0.404508 0.293892 91
- vertex -0.5 0 91
+ vertex 0.154508 -0.475528 91
+ vertex -0.154508 -0.475528 61
+ vertex 0.154508 -0.475528 61
endloop
endfacet
facet normal -0.587786 -0.809016 0
@@ -909,59 +909,59 @@ solid OpenSCAD_Model
vertex -0.154508 -0.475528 61
endloop
endfacet
- facet normal 0.951056 -0.309019 0
+ facet normal 0 0 1
outer loop
+ vertex 0.404508 0.293892 91
vertex 0.404508 -0.293892 91
- vertex 0.5 0 61
vertex 0.5 0 91
endloop
endfacet
- facet normal 0.951056 -0.309019 0
+ facet normal 0 0 1
outer loop
- vertex 0.5 0 61
+ vertex 0.154508 0.475528 91
vertex 0.404508 -0.293892 91
- vertex 0.404508 -0.293892 61
+ vertex 0.404508 0.293892 91
endloop
endfacet
- facet normal -0.587786 0.809016 0
+ facet normal 0 0 1
outer loop
- vertex -0.154508 0.475528 61
- vertex -0.404508 0.293892 91
- vertex -0.154508 0.475528 91
+ vertex 0.154508 0.475528 91
+ vertex 0.154508 -0.475528 91
+ vertex 0.404508 -0.293892 91
endloop
endfacet
- facet normal -0.587786 0.809016 0
+ facet normal -0 0 1
outer loop
- vertex -0.404508 0.293892 91
- vertex -0.154508 0.475528 61
- vertex -0.404508 0.293892 61
+ vertex -0.154508 0.475528 91
+ vertex 0.154508 -0.475528 91
+ vertex 0.154508 0.475528 91
endloop
endfacet
- facet normal 0 -1 0
+ facet normal 0 0 1
outer loop
- vertex -0.154508 -0.475528 61
- vertex 0.154508 -0.475528 91
+ vertex -0.154508 0.475528 91
vertex -0.154508 -0.475528 91
+ vertex 0.154508 -0.475528 91
endloop
endfacet
- facet normal 0 -1 -0
+ facet normal -0 0 1
outer loop
- vertex 0.154508 -0.475528 91
- vertex -0.154508 -0.475528 61
- vertex 0.154508 -0.475528 61
+ vertex -0.404508 0.293892 91
+ vertex -0.154508 -0.475528 91
+ vertex -0.154508 0.475528 91
endloop
endfacet
- facet normal -0.951056 0.309019 0
+ facet normal 0 0 1
outer loop
- vertex -0.5 0 61
vertex -0.404508 0.293892 91
- vertex -0.404508 0.293892 61
+ vertex -0.404508 -0.293892 91
+ vertex -0.154508 -0.475528 91
endloop
endfacet
- facet normal -0.951056 0.309019 0
+ facet normal 0 -0 1
outer loop
+ vertex -0.404508 -0.293892 91
vertex -0.404508 0.293892 91
- vertex -0.5 0 61
vertex -0.5 0 91
endloop
endfacet
@@ -1119,6 +1119,118 @@ solid OpenSCAD_Model
vertex -2 0 11
endloop
endfacet
+ facet normal 0.453991 0.891006 -0
+ outer loop
+ vertex 1.17557 1.61803 1
+ vertex 0.618033 1.90211 11
+ vertex 1.17557 1.61803 11
+ endloop
+ endfacet
+ facet normal 0.453991 0.891006 0
+ outer loop
+ vertex 0.618033 1.90211 11
+ vertex 1.17557 1.61803 1
+ vertex 0.618033 1.90211 1
+ endloop
+ endfacet
+ facet normal -0.156439 -0.987688 0
+ outer loop
+ vertex -0.618033 -1.90211 1
+ vertex 0 -2 11
+ vertex -0.618033 -1.90211 11
+ endloop
+ endfacet
+ facet normal -0.156439 -0.987688 -0
+ outer loop
+ vertex 0 -2 11
+ vertex -0.618033 -1.90211 1
+ vertex 0 -2 1
+ endloop
+ endfacet
+ facet normal 0.156439 0.987688 -0
+ outer loop
+ vertex 0.618033 1.90211 1
+ vertex 0 2 11
+ vertex 0.618033 1.90211 11
+ endloop
+ endfacet
+ facet normal 0.156439 0.987688 0
+ outer loop
+ vertex 0 2 11
+ vertex 0.618033 1.90211 1
+ vertex 0 2 1
+ endloop
+ endfacet
+ facet normal -0.891006 -0.453991 0
+ outer loop
+ vertex -1.61803 -1.17557 1
+ vertex -1.90211 -0.618033 11
+ vertex -1.90211 -0.618033 1
+ endloop
+ endfacet
+ facet normal -0.891006 -0.453991 0
+ outer loop
+ vertex -1.90211 -0.618033 11
+ vertex -1.61803 -1.17557 1
+ vertex -1.61803 -1.17557 11
+ endloop
+ endfacet
+ facet normal -0.156439 0.987688 0
+ outer loop
+ vertex 0 2 1
+ vertex -0.618033 1.90211 11
+ vertex 0 2 11
+ endloop
+ endfacet
+ facet normal -0.156439 0.987688 0
+ outer loop
+ vertex -0.618033 1.90211 11
+ vertex 0 2 1
+ vertex -0.618033 1.90211 1
+ endloop
+ endfacet
+ facet normal -0.453991 -0.891006 0
+ outer loop
+ vertex -1.17557 -1.61803 1
+ vertex -0.618033 -1.90211 11
+ vertex -1.17557 -1.61803 11
+ endloop
+ endfacet
+ facet normal -0.453991 -0.891006 -0
+ outer loop
+ vertex -0.618033 -1.90211 11
+ vertex -1.17557 -1.61803 1
+ vertex -0.618033 -1.90211 1
+ endloop
+ endfacet
+ facet normal -0.707107 -0.707107 0
+ outer loop
+ vertex -1.17557 -1.61803 1
+ vertex -1.61803 -1.17557 11
+ vertex -1.61803 -1.17557 1
+ endloop
+ endfacet
+ facet normal -0.707107 -0.707107 0
+ outer loop
+ vertex -1.61803 -1.17557 11
+ vertex -1.17557 -1.61803 1
+ vertex -1.17557 -1.61803 11
+ endloop
+ endfacet
+ facet normal -0.987688 -0.156439 0
+ outer loop
+ vertex -1.90211 -0.618033 1
+ vertex -2 0 11
+ vertex -2 0 1
+ endloop
+ endfacet
+ facet normal -0.987688 -0.156439 0
+ outer loop
+ vertex -2 0 11
+ vertex -1.90211 -0.618033 1
+ vertex -1.90211 -0.618033 11
+ endloop
+ endfacet
facet normal 0 0 1
outer loop
vertex 2 0 1
@@ -1399,186 +1511,60 @@ solid OpenSCAD_Model
vertex -9.51056 -3.09017 1
endloop
endfacet
- facet normal 0.453991 0.891006 -0
+ facet normal -0.707107 0.707107 0
outer loop
- vertex 1.17557 1.61803 1
- vertex 0.618033 1.90211 11
- vertex 1.17557 1.61803 11
+ vertex -1.61803 1.17557 1
+ vertex -1.17557 1.61803 11
+ vertex -1.17557 1.61803 1
endloop
endfacet
- facet normal 0.453991 0.891006 0
+ facet normal -0.707107 0.707107 0
outer loop
- vertex 0.618033 1.90211 11
- vertex 1.17557 1.61803 1
- vertex 0.618033 1.90211 1
+ vertex -1.17557 1.61803 11
+ vertex -1.61803 1.17557 1
+ vertex -1.61803 1.17557 11
endloop
endfacet
- facet normal -0.156439 -0.987688 0
+ facet normal 0.987688 0.156436 0
outer loop
- vertex -0.618033 -1.90211 1
- vertex 0 -2 11
- vertex -0.618033 -1.90211 11
+ vertex 10 0 1
+ vertex 9.51056 3.09017 0
+ vertex 9.51056 3.09017 1
endloop
endfacet
- facet normal -0.156439 -0.987688 -0
+ facet normal 0.987688 0.156436 0
outer loop
- vertex 0 -2 11
- vertex -0.618033 -1.90211 1
- vertex 0 -2 1
+ vertex 9.51056 3.09017 0
+ vertex 10 0 1
+ vertex 10 0 0
endloop
endfacet
- facet normal 0.156439 0.987688 -0
- outer loop
- vertex 0.618033 1.90211 1
- vertex 0 2 11
- vertex 0.618033 1.90211 11
- endloop
- endfacet
- facet normal 0.156439 0.987688 0
- outer loop
- vertex 0 2 11
- vertex 0.618033 1.90211 1
- vertex 0 2 1
- endloop
- endfacet
- facet normal -0.891006 -0.453991 0
- outer loop
- vertex -1.61803 -1.17557 1
- vertex -1.90211 -0.618033 11
- vertex -1.90211 -0.618033 1
- endloop
- endfacet
- facet normal -0.891006 -0.453991 0
- outer loop
- vertex -1.90211 -0.618033 11
- vertex -1.61803 -1.17557 1
- vertex -1.61803 -1.17557 11
- endloop
- endfacet
- facet normal -0.156439 0.987688 0
- outer loop
- vertex 0 2 1
- vertex -0.618033 1.90211 11
- vertex 0 2 11
- endloop
- endfacet
- facet normal -0.156439 0.987688 0
- outer loop
- vertex -0.618033 1.90211 11
- vertex 0 2 1
- vertex -0.618033 1.90211 1
- endloop
- endfacet
- facet normal -0.707107 -0.707107 0
- outer loop
- vertex -1.17557 -1.61803 1
- vertex -1.61803 -1.17557 11
- vertex -1.61803 -1.17557 1
- endloop
- endfacet
- facet normal -0.707107 -0.707107 0
- outer loop
- vertex -1.61803 -1.17557 11
- vertex -1.17557 -1.61803 1
- vertex -1.17557 -1.61803 11
- endloop
- endfacet
- facet normal -0.987688 -0.156439 0
- outer loop
- vertex -1.90211 -0.618033 1
- vertex -2 0 11
- vertex -2 0 1
- endloop
- endfacet
- facet normal -0.987688 -0.156439 0
- outer loop
- vertex -2 0 11
- vertex -1.90211 -0.618033 1
- vertex -1.90211 -0.618033 11
- endloop
- endfacet
- facet normal -0.453991 -0.891006 0
+ facet normal -0.45399 -0.891007 0
outer loop
- vertex -1.17557 -1.61803 1
- vertex -0.618033 -1.90211 11
- vertex -1.17557 -1.61803 11
+ vertex -5.87785 -8.09017 0
+ vertex -3.09017 -9.51056 1
+ vertex -5.87785 -8.09017 1
endloop
endfacet
- facet normal -0.453991 -0.891006 -0
+ facet normal -0.45399 -0.891007 -0
outer loop
- vertex -0.618033 -1.90211 11
- vertex -1.17557 -1.61803 1
- vertex -0.618033 -1.90211 1
+ vertex -3.09017 -9.51056 1
+ vertex -5.87785 -8.09017 0
+ vertex -3.09017 -9.51056 0
endloop
endfacet
facet normal -0.707107 0.707107 0
outer loop
- vertex -1.61803 1.17557 1
- vertex -1.17557 1.61803 11
- vertex -1.17557 1.61803 1
+ vertex -8.09017 5.87785 0
+ vertex -5.87785 8.09017 1
+ vertex -5.87785 8.09017 0
endloop
endfacet
facet normal -0.707107 0.707107 0
outer loop
- vertex -1.17557 1.61803 11
- vertex -1.61803 1.17557 1
- vertex -1.61803 1.17557 11
- endloop
- endfacet
- facet normal 0.891007 0.45399 0
- outer loop
- vertex 9.51056 3.09017 1
- vertex 8.09017 5.87785 0
- vertex 8.09017 5.87785 1
- endloop
- endfacet
- facet normal 0.891007 0.45399 0
- outer loop
- vertex 8.09017 5.87785 0
- vertex 9.51056 3.09017 1
- vertex 9.51056 3.09017 0
- endloop
- endfacet
- facet normal 0.987688 0.156436 0
- outer loop
- vertex 10 0 1
- vertex 9.51056 3.09017 0
- vertex 9.51056 3.09017 1
- endloop
- endfacet
- facet normal 0.987688 0.156436 0
- outer loop
- vertex 9.51056 3.09017 0
- vertex 10 0 1
- vertex 10 0 0
- endloop
- endfacet
- facet normal 0.707107 0.707107 0
- outer loop
- vertex 8.09017 5.87785 1
- vertex 5.87785 8.09017 0
- vertex 5.87785 8.09017 1
- endloop
- endfacet
- facet normal 0.707107 0.707107 0
- outer loop
- vertex 5.87785 8.09017 0
- vertex 8.09017 5.87785 1
- vertex 8.09017 5.87785 0
- endloop
- endfacet
- facet normal 0.156436 0.987688 -0
- outer loop
- vertex 3.09017 9.51056 0
- vertex 0 10 1
- vertex 3.09017 9.51056 1
- endloop
- endfacet
- facet normal 0.156436 0.987688 0
- outer loop
- vertex 0 10 1
- vertex 3.09017 9.51056 0
- vertex 0 10 0
+ vertex -5.87785 8.09017 1
+ vertex -8.09017 5.87785 0
+ vertex -8.09017 5.87785 1
endloop
endfacet
facet normal 0 0 -1
@@ -1707,102 +1693,116 @@ solid OpenSCAD_Model
vertex -10 0 0
endloop
endfacet
- facet normal -0.987688 0.156436 0
+ facet normal 0.891007 0.45399 0
outer loop
- vertex -10 0 0
- vertex -9.51056 3.09017 1
- vertex -9.51056 3.09017 0
+ vertex 9.51056 3.09017 1
+ vertex 8.09017 5.87785 0
+ vertex 8.09017 5.87785 1
endloop
endfacet
- facet normal -0.987688 0.156436 0
+ facet normal 0.891007 0.45399 0
outer loop
- vertex -9.51056 3.09017 1
- vertex -10 0 0
- vertex -10 0 1
+ vertex 8.09017 5.87785 0
+ vertex 9.51056 3.09017 1
+ vertex 9.51056 3.09017 0
endloop
endfacet
- facet normal 0.891007 -0.45399 0
+ facet normal 0.707107 -0.707107 0
outer loop
+ vertex 5.87785 -8.09017 1
+ vertex 8.09017 -5.87785 0
vertex 8.09017 -5.87785 1
- vertex 9.51056 -3.09017 0
- vertex 9.51056 -3.09017 1
endloop
endfacet
- facet normal 0.891007 -0.45399 0
+ facet normal 0.707107 -0.707107 0
outer loop
- vertex 9.51056 -3.09017 0
- vertex 8.09017 -5.87785 1
vertex 8.09017 -5.87785 0
+ vertex 5.87785 -8.09017 1
+ vertex 5.87785 -8.09017 0
endloop
endfacet
- facet normal 0.45399 0.891007 -0
+ facet normal 0.156436 -0.987688 0
+ outer loop
+ vertex 0 -10 0
+ vertex 3.09017 -9.51056 1
+ vertex 0 -10 1
+ endloop
+ endfacet
+ facet normal 0.156436 -0.987688 0
+ outer loop
+ vertex 3.09017 -9.51056 1
+ vertex 0 -10 0
+ vertex 3.09017 -9.51056 0
+ endloop
+ endfacet
+ facet normal 0.707107 0.707107 0
outer loop
+ vertex 8.09017 5.87785 1
vertex 5.87785 8.09017 0
- vertex 3.09017 9.51056 1
vertex 5.87785 8.09017 1
endloop
endfacet
- facet normal 0.45399 0.891007 0
+ facet normal 0.707107 0.707107 0
outer loop
- vertex 3.09017 9.51056 1
vertex 5.87785 8.09017 0
- vertex 3.09017 9.51056 0
+ vertex 8.09017 5.87785 1
+ vertex 8.09017 5.87785 0
endloop
endfacet
- facet normal -0.45399 0.891007 0
+ facet normal -0.987688 -0.156436 0
outer loop
- vertex -3.09017 9.51056 0
- vertex -5.87785 8.09017 1
- vertex -3.09017 9.51056 1
+ vertex -9.51056 -3.09017 0
+ vertex -10 0 1
+ vertex -10 0 0
endloop
endfacet
- facet normal -0.45399 0.891007 0
+ facet normal -0.987688 -0.156436 0
outer loop
- vertex -5.87785 8.09017 1
- vertex -3.09017 9.51056 0
- vertex -5.87785 8.09017 0
+ vertex -10 0 1
+ vertex -9.51056 -3.09017 0
+ vertex -9.51056 -3.09017 1
endloop
endfacet
- facet normal -0.156436 -0.987688 0
+ facet normal -0.707107 -0.707107 0
outer loop
- vertex -3.09017 -9.51056 0
- vertex 0 -10 1
- vertex -3.09017 -9.51056 1
+ vertex -5.87785 -8.09017 0
+ vertex -8.09017 -5.87785 1
+ vertex -8.09017 -5.87785 0
endloop
endfacet
- facet normal -0.156436 -0.987688 -0
+ facet normal -0.707107 -0.707107 0
outer loop
- vertex 0 -10 1
- vertex -3.09017 -9.51056 0
- vertex 0 -10 0
+ vertex -8.09017 -5.87785 1
+ vertex -5.87785 -8.09017 0
+ vertex -5.87785 -8.09017 1
endloop
endfacet
- facet normal 0.707107 -0.707107 0
+ facet normal 0.45399 -0.891007 0
outer loop
+ vertex 3.09017 -9.51056 0
vertex 5.87785 -8.09017 1
- vertex 8.09017 -5.87785 0
- vertex 8.09017 -5.87785 1
+ vertex 3.09017 -9.51056 1
endloop
endfacet
- facet normal 0.707107 -0.707107 0
+ facet normal 0.45399 -0.891007 0
outer loop
- vertex 8.09017 -5.87785 0
vertex 5.87785 -8.09017 1
+ vertex 3.09017 -9.51056 0
vertex 5.87785 -8.09017 0
endloop
endfacet
- facet normal -0.891007 -0.45399 0
+ facet normal 0.45399 0.891007 -0
outer loop
- vertex -8.09017 -5.87785 0
- vertex -9.51056 -3.09017 1
- vertex -9.51056 -3.09017 0
+ vertex 5.87785 8.09017 0
+ vertex 3.09017 9.51056 1
+ vertex 5.87785 8.09017 1
endloop
endfacet
- facet normal -0.891007 -0.45399 0
+ facet normal 0.45399 0.891007 0
outer loop
- vertex -9.51056 -3.09017 1
- vertex -8.09017 -5.87785 0
- vertex -8.09017 -5.87785 1
+ vertex 3.09017 9.51056 1
+ vertex 5.87785 8.09017 0
+ vertex 3.09017 9.51056 0
endloop
endfacet
facet normal -0.156436 0.987688 0
@@ -1819,46 +1819,74 @@ solid OpenSCAD_Model
vertex -3.09017 9.51056 0
endloop
endfacet
- facet normal 0.45399 -0.891007 0
+ facet normal 0.156436 0.987688 -0
outer loop
- vertex 3.09017 -9.51056 0
- vertex 5.87785 -8.09017 1
- vertex 3.09017 -9.51056 1
+ vertex 3.09017 9.51056 0
+ vertex 0 10 1
+ vertex 3.09017 9.51056 1
endloop
endfacet
- facet normal 0.45399 -0.891007 0
+ facet normal 0.156436 0.987688 0
outer loop
- vertex 5.87785 -8.09017 1
- vertex 3.09017 -9.51056 0
- vertex 5.87785 -8.09017 0
+ vertex 0 10 1
+ vertex 3.09017 9.51056 0
+ vertex 0 10 0
endloop
endfacet
- facet normal 0.156436 -0.987688 0
+ facet normal -0.156436 -0.987688 0
outer loop
- vertex 0 -10 0
- vertex 3.09017 -9.51056 1
+ vertex -3.09017 -9.51056 0
vertex 0 -10 1
+ vertex -3.09017 -9.51056 1
endloop
endfacet
- facet normal 0.156436 -0.987688 0
+ facet normal -0.156436 -0.987688 -0
outer loop
- vertex 3.09017 -9.51056 1
+ vertex 0 -10 1
+ vertex -3.09017 -9.51056 0
vertex 0 -10 0
- vertex 3.09017 -9.51056 0
endloop
endfacet
- facet normal -0.987688 -0.156436 0
+ facet normal -0.45399 0.891007 0
+ outer loop
+ vertex -3.09017 9.51056 0
+ vertex -5.87785 8.09017 1
+ vertex -3.09017 9.51056 1
+ endloop
+ endfacet
+ facet normal -0.45399 0.891007 0
outer loop
+ vertex -5.87785 8.09017 1
+ vertex -3.09017 9.51056 0
+ vertex -5.87785 8.09017 0
+ endloop
+ endfacet
+ facet normal -0.891007 -0.45399 0
+ outer loop
+ vertex -8.09017 -5.87785 0
+ vertex -9.51056 -3.09017 1
vertex -9.51056 -3.09017 0
- vertex -10 0 1
+ endloop
+ endfacet
+ facet normal -0.891007 -0.45399 0
+ outer loop
+ vertex -9.51056 -3.09017 1
+ vertex -8.09017 -5.87785 0
+ vertex -8.09017 -5.87785 1
+ endloop
+ endfacet
+ facet normal -0.987688 0.156436 0
+ outer loop
vertex -10 0 0
+ vertex -9.51056 3.09017 1
+ vertex -9.51056 3.09017 0
endloop
endfacet
- facet normal -0.987688 -0.156436 0
+ facet normal -0.987688 0.156436 0
outer loop
+ vertex -9.51056 3.09017 1
+ vertex -10 0 0
vertex -10 0 1
- vertex -9.51056 -3.09017 0
- vertex -9.51056 -3.09017 1
endloop
endfacet
facet normal -0.891007 0.45399 0
@@ -1875,18 +1903,18 @@ solid OpenSCAD_Model
vertex -9.51056 3.09017 1
endloop
endfacet
- facet normal -0.707107 0.707107 0
+ facet normal 0.891007 -0.45399 0
outer loop
- vertex -8.09017 5.87785 0
- vertex -5.87785 8.09017 1
- vertex -5.87785 8.09017 0
+ vertex 8.09017 -5.87785 1
+ vertex 9.51056 -3.09017 0
+ vertex 9.51056 -3.09017 1
endloop
endfacet
- facet normal -0.707107 0.707107 0
+ facet normal 0.891007 -0.45399 0
outer loop
- vertex -5.87785 8.09017 1
- vertex -8.09017 5.87785 0
- vertex -8.09017 5.87785 1
+ vertex 9.51056 -3.09017 0
+ vertex 8.09017 -5.87785 1
+ vertex 8.09017 -5.87785 0
endloop
endfacet
facet normal 0.987688 -0.156436 0
@@ -1903,32 +1931,4 @@ solid OpenSCAD_Model
vertex 9.51056 -3.09017 0
endloop
endfacet
- facet normal -0.707107 -0.707107 0
- outer loop
- vertex -5.87785 -8.09017 0
- vertex -8.09017 -5.87785 1
- vertex -8.09017 -5.87785 0
- endloop
- endfacet
- facet normal -0.707107 -0.707107 0
- outer loop
- vertex -8.09017 -5.87785 1
- vertex -5.87785 -8.09017 0
- vertex -5.87785 -8.09017 1
- endloop
- endfacet
- facet normal -0.45399 -0.891007 0
- outer loop
- vertex -5.87785 -8.09017 0
- vertex -3.09017 -9.51056 1
- vertex -5.87785 -8.09017 1
- endloop
- endfacet
- facet normal -0.45399 -0.891007 -0
- outer loop
- vertex -3.09017 -9.51056 1
- vertex -5.87785 -8.09017 0
- vertex -3.09017 -9.51056 0
- endloop
- endfacet
endsolid OpenSCAD_Model
diff --git a/checker/src/models/syringe-bin.stl b/checker/src/models/syringe-bin.stl
Binary files differ.
diff --git a/service/entrypoint.sh b/service/entrypoint.sh
@@ -11,6 +11,6 @@ while [ 1 ]; do
sleep 70
done &
-CMD="ncat --keep-open --listen -p 9000 --max-conns 200 \
+CMD="ncat --keep-open --listen -p 9000 --max-conns 4000 \
--no-shutdown --wait 10s --idle-timeout 180s --exec /service/build/stldoctor"
su -s /bin/sh -c "$CMD" service
diff --git a/service/src/main.c b/service/src/main.c
@@ -348,7 +348,7 @@ search_cmd(const char *arg)
while (1) {
resp = ask("> Enter %s [q to quit]: ",
resp ? "another" : "hash");
- if (strchr(resp, 'q')) break;
+ if (strchr(resp, 'q') || !*resp) break;
if (checkalph(resp, ".abcdef0123456789-") != OK) {
ERR("Invalid model id specified\n");
goto exit;
diff --git a/service/src/stlfile.c b/service/src/stlfile.c
@@ -270,8 +270,7 @@ parse_file_bin(struct parseinfo *info, char *buf, size_t len)
memcpy(info->header, buf, 80);
- if (*buf == '#' && strlen(buf + 1))
- info->solidname = checkp(strdup(buf + 1));
+ info->solidname = checkp(strndup(buf + (*buf == '#'), 80));
bp = buf + 80;
@@ -343,8 +342,6 @@ parse_file(struct parseinfo *info, char *buf, size_t len, char **modelname)
: parse_file_bin(info, buf, len);
if (status == FAIL) return FAIL;
- if (!info->solidname) info->solidname = checkp(strdup(""));
-
info->modelname = *modelname;
*modelname = NULL;
diff --git a/src/stlfile.c b/src/stlfile.c
@@ -270,8 +270,7 @@ parse_file_bin(struct parseinfo *info, char *buf, size_t len)
memcpy(info->header, buf, 80);
- if (*buf == '#' && strlen(buf + 1))
- info->solidname = checkp(strdup(buf + 1));
+ info->solidname = checkp(strndup(buf + (*buf == '#'), 80));
bp = buf + 80;
@@ -344,8 +343,6 @@ parse_file(struct parseinfo *info, char *buf, size_t len, char **modelname)
: parse_file_bin(info, buf, len);
if (status == FAIL) return FAIL;
- if (!info->solidname) info->solidname = checkp(strdup(""));
-
/* transfer ownership */
info->modelname = *modelname;
*modelname = NULL;
