Fix previous commit qca#2

Signed-off-by: Michael Heimpold <[email protected]>
chargebyte · Nov 2, 2017 · 5aef89f · 5aef89f
1 parent d597e6f
commit 5aef89f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/slac/evse.c b/slac/evse.c
@@ -289,6 +289,11 @@ static void UnmatchedState (struct session * session, struct channel * channel,
 		session->state = EVSE_STATE_UNOCCUPIED;
 		return;
 	}
+	if (_allset( session->flags, SLAC_SOUNDONLY))
+	{
+		session->state = EVSE_STATE_UNOCCUPIED;
+		return;
+	}
 	slac_debug (session, 0, __func__, "Matching ...");
 	if (evse_cm_slac_match (session, channel, message))
 	{
@@ -397,7 +402,6 @@ int main (int argc, char const * argv [])
 	char const * profile = PROFILE;
 	char const * section = SECTION;
 	signed c;
-	int sound_only = 0;
 	int dont_loop = 0;
 	memset (& session, 0, sizeof (session));
 	memset (& message, 0, sizeof (message));
@@ -445,7 +449,7 @@ int main (int argc, char const * argv [])
 			break;
 
 		case 'K':
-			sound_only = 1;
+			_setbits (session.flags, SLAC_SOUNDONLY);
 			break;
 		case 'l':
 			dont_loop = 1;
@@ -482,7 +486,7 @@ int main (int argc, char const * argv [])
 	openchannel (& channel);
 	initialize (& session, profile, section);
 	identifier (& session, & channel);
-	if (!sound_only)
+	if (_allclr (session.flags, SLAC_SOUNDONLY))
 	{
 		if (evse_cm_set_key (& session, & channel, & message))
 		{
@@ -502,7 +506,7 @@ int main (int argc, char const * argv [])
 			UnmatchedState (& session, & channel, & message);
 			continue;
 		}
-		if (sound_only)
+		if (_allset (session.flags, SLAC_SOUNDONLY))
 		{
 			break;
 		}

diff --git a/slac/pev.c b/slac/pev.c
@@ -308,6 +308,11 @@ static void UnmatchedState (struct session * session, struct channel * channel,
 		session->state = PEV_STATE_DISCONNECTED;
 		return;
 	}
+	if (_allset( session->flags, SLAC_SOUNDONLY))
+	{
+		session->state = PEV_STATE_DISCONNECTED;
+		return;
+	}
 	slac_debug (session, 0, __func__, "Matching ...");
 	if (pev_cm_slac_match (session, channel, message))
 	{
@@ -423,7 +428,6 @@ int main (int argc, char const * argv [])
 	char const * profile = PROFILE;
 	char const * section = SECTION;
 	signed c;
-	int sound_only = 0;
 	memset (& session, 0, sizeof (session));
 	memset (& message, 0, sizeof (message));
 	channel.timeout = SLAC_TIMEOUT;
@@ -469,7 +473,7 @@ int main (int argc, char const * argv [])
 
 			break;
 		case 'K':
-			sound_only = 1;
+			_setbits (session.flags, SLAC_SOUNDONLY);
 			break;
 		case 'l':
 			state = PEV_STATE_DISCONNECTED;
@@ -506,7 +510,7 @@ int main (int argc, char const * argv [])
 	openchannel (& channel);
 	identifier (& session, & channel);
 	initialize (& session, profile, section);
-	if (!sound_only)
+	if (_allset (session.flags, SLAC_SOUNDONLY))
 	{
 		if (pev_cm_set_key (& session, & channel, & message))
 		{
@@ -526,7 +530,7 @@ int main (int argc, char const * argv [])
 			UnmatchedState (& session, & channel, & message);
 			continue;
 		}
-		if (sound_only)
+		if (_allset (session.flags, SLAC_SOUNDONLY))
 		{
 			break;
 		}

diff --git a/slac/slac.h b/slac/slac.h
@@ -108,10 +108,11 @@
 #define SLAC_CHARGETIME 2
 #define SLAC_FLAGS 0
 
-#define SLAC_SILENCE (1 << 0)
-#define SLAC_VERBOSE (1 << 1)
-#define SLAC_SESSION (1 << 2)
-#define SLAC_COMPARE (1 << 3)
+#define SLAC_SILENCE   (1 << 0)
+#define SLAC_VERBOSE   (1 << 1)
+#define SLAC_SESSION   (1 << 2)
+#define SLAC_COMPARE   (1 << 3)
+#define SLAC_SOUNDONLY (1 << 4)
 
 #define SLAC_CM_SETKEY_KEYTYPE 0x01
 #define SLAC_CM_SETKEY_PID 0x02