fix(client): Default to a hop count of 255 rather than 0

adam-nielsen · adam-nielsen · commit f1133b6efe6a · 2019-03-29T09:06:22.000+10:00
diff --git a/lib/client.js b/lib/client.js
@@ -13,7 +13,6 @@ const baNpdu            = require('./npdu');
 const baBvlc            = require('./bvlc');
 const baEnum            = require('./enum');
 
-const DEFAULT_HOP_COUNT = 0xFF;
 const BVLC_HEADER_LENGTH = 4;
 
 /**
diff --git a/lib/npdu.js b/lib/npdu.js
@@ -2,6 +2,7 @@
 
 const baEnum      = require('./enum');
 
+const DEFAULT_HOP_COUNT = 0xFF;
 const BACNET_PROTOCOL_VERSION = 1;
 const BacnetAddressTypes = {
   NONE: 0,
@@ -103,7 +104,7 @@ module.exports.encode = (buffer, funct, destination, source, hopCount, networkMs
   }
 
   if (hasDestination) {
-    buffer.buffer[buffer.offset++] = hopCount;
+    buffer.buffer[buffer.offset++] = hopCount || DEFAULT_HOP_COUNT;
   }
 
   if ((funct & baEnum.NpduControlBits.NETWORK_LAYER_MESSAGE) > 0) {

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`const baEnum = require('./enum');`
`4`	`4`
	`5`	`+const DEFAULT_HOP_COUNT = 0xFF;`
`5`	`6`	`const BACNET_PROTOCOL_VERSION = 1;`
`6`	`7`	`const BacnetAddressTypes = {`
`7`	`8`	`NONE: 0,`
`@@ -103,7 +104,7 @@ module.exports.encode = (buffer, funct, destination, source, hopCount, networkMs`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`if (hasDestination) {`
`106`		`- buffer.buffer[buffer.offset++] = hopCount;`
	`107`	`+ buffer.buffer[buffer.offset++] = hopCount \|\| DEFAULT_HOP_COUNT;`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`if ((funct & baEnum.NpduControlBits.NETWORK_LAYER_MESSAGE) > 0) {`