HGKeeper

Fix crash in runtime if PSK secret is missing

2019-03-13, Andrey Skvortsov

a3ec35ee94e7

Fix crash in runtime if PSK secret is missing

./Beremiz_service.py -s $PWD/psk2.txt -n beremiz /tmp/beremiz
Beremiz_service: 1.2-1378c18402c3+

Traceback (most recent call last):
File "./Beremiz_service.py", line 511, in
ensurePSK(servicename, PSKpath)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/Stunnel.py", line 32, in ensurePSK
PSKgen(ID, PSKpath)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/Stunnel.py", line 23, in PSKgen
call(restart_stunnel_cmdline)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/spawn_subprocess.py", line 116, in call
pid = posix_spawn.posix_spawnp(cmd[0], cmd)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 120, in posix_spawnp
return _posix_spawn(lib.posix_spawnp, *args, **kwargs)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 111, in _posix_spawn
_check_error(res, path)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 10, in _check_error
raise OSError(errno, os.strerror(errno), path)
OSError: [Errno 2] No such file or directory: '/etc/init.d/S50stunnel'

/**************************************************************************

* Permission is hereby granted, free of charge, to any person obtaining

* a 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 all copies or substantial portions of the Software.

* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

*********************************************************************/

#ifndef MULTISTATE_OUTPUT_H

#define MULTISTATE_OUTPUT_H

#include <stdbool.h>

#include <stdint.h>

#include "bacdef.h"

#include "bacerror.h"

#include "rp.h"

#include "wp.h"

#ifdef __cplusplus

extern "C" {

#endif /* __cplusplus */

/* MultiState Outputs are encoded in unsigned integer

* (in BACnet => uint8_t), and can not be 0.

* See ASHRAE 135-2016, section 12.20.4

#define MULTISTATE_MAX_NUMBER_OF_STATES (255)

typedef struct Multistate_Output_descr {

/* pointer to IEC 61131-3 located variable that is mapped onto this BACnet object */

uint8_t *Located_Var_ptr;

uint32_t Object_Identifier; /* called object 'Instance' in the source code! */

char *Object_Name;

char *Description;

uint8_t Number_Of_States;

/* stores the current value */

/* one entry per priority value */

uint8_t Present_Value[BACNET_MAX_PRIORITY];

/* Writable out-of-service allows others to manipulate our Present Value */

bool Out_Of_Service;

char State_Text[MULTISTATE_MAX_NUMBER_OF_STATES][64];

} MULTISTATE_OUTPUT_DESCR;

void Multistate_Output_Property_Lists(

const int **pRequired,

const int **pOptional,

const int **pProprietary);

bool Multistate_Output_Valid_Instance(

uint32_t object_instance);

unsigned Multistate_Output_Count(

void);

uint32_t Multistate_Output_Index_To_Instance(

unsigned index);

unsigned Multistate_Output_Instance_To_Index(

uint32_t instance);

int Multistate_Output_Read_Property(

BACNET_READ_PROPERTY_DATA * rpdata);

bool Multistate_Output_Write_Property(

BACNET_WRITE_PROPERTY_DATA * wp_data);

/* optional API */

bool Multistate_Output_Object_Name(

uint32_t object_instance,

BACNET_CHARACTER_STRING * object_name);

uint32_t Multistate_Output_Present_Value(

uint32_t object_instance);

bool Multistate_Output_Present_Value_Set(

uint32_t object_instance,

uint32_t value,

uint8_t priority);

bool Multistate_Output_Out_Of_Service(

uint32_t object_instance);

void Multistate_Output_Out_Of_Service_Set(

uint32_t object_instance,

bool value);

void Multistate_Output_Init(

void);

#ifdef __cplusplus

}

#endif /* __cplusplus */

#endif