ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lock down mesh propagation: only propagate fahrplan and time. 

Also fix time limit for 28c3 duration
This commit is contained in:
Stefan `Sec` Zehl 2011-12-22 19:59:56 +01:00
parent fb010d0250
commit d06b050f82
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/funk/mesh.c
View File

@ -31,9 +31,9 @@ void initMesh(void){
int mesh_sanity(uint8_t * pkt){ int mesh_sanity(uint8_t * pkt){
if(MO_TYPE(pkt)>='A' && MO_TYPE(pkt)<='Z'){ if(MO_TYPE(pkt)>='A' && MO_TYPE(pkt)<='Z'){
if(MO_TIME(pkt)>1313803870) if(MO_TIME(pkt)>1325379600)
return 1; return 1;
if(MO_TIME(pkt)<1312075898) if(MO_TIME(pkt)<1324602000)
return 1; return 1;
}else if(MO_TYPE(pkt)>='a' && MO_TYPE(pkt)<='z'){ }else if(MO_TYPE(pkt)>='a' && MO_TYPE(pkt)<='z'){
if(MO_TIME(pkt)>16777216) if(MO_TIME(pkt)>16777216)
@ -41,7 +41,12 @@ int mesh_sanity(uint8_t * pkt){
if(MO_TIME(pkt)<0) if(MO_TIME(pkt)<0)
return 1; return 1;
}; };
if(MO_TYPE(pkt)=='t'){ if(MO_TYPE(pkt)!='E' &&
MO_TYPE(pkt)!='F' &&
MO_TYPE(pkt)!='G' &&
MO_TYPE(pkt)!='T' &&
1
){
return 1; return 1;
}; };
if(MO_TYPE(pkt)>0x7f || MO_TYPE(pkt)<0x20) if(MO_TYPE(pkt)>0x7f || MO_TYPE(pkt)<0x20)
@ -92,7 +97,7 @@ void mesh_cleanup(void){
}; };
if(mesh_sanity(meshbuffer[i].pkt)){ if(mesh_sanity(meshbuffer[i].pkt)){
meshbuffer[i].flags=MF_FREE; meshbuffer[i].flags=MF_FREE;
#if 1 #if 0
setSystemFont(); setSystemFont();
lcdClear(); lcdClear();
lcdPrintln("MESH PANIC!"); lcdPrintln("MESH PANIC!");