1
0
mirror of https://github.com/JoelBender/bacpypes synced 2025-10-05 22:18:16 +08:00
Commit Graph

357 Commits

Author SHA1 Message Date
Joel Bender
9b68c2f7be sync up the changes between the py27 and py34 versions 2017-04-28 15:29:03 -04:00
Joel Bender
547f1216a2 debugging updates 2017-04-28 15:20:35 -04:00
Joel Bender
0bb03f83d7 non-blocking cleanup of the queue for abort 2017-04-27 21:26:24 -04:00
Joel Bender
34039b5cc7 add a simple function to dump the stack 2017-04-27 21:25:51 -04:00
Joel Bender
6565627b98 sync with changes in py3 code 2017-04-27 11:36:44 -04:00
Joel Bender
90a3e62692 copy/paste duplicate 2017-04-27 01:54:16 -04:00
Joel Bender
2e28d3af4d subtle changes to connection logic and renamed timeout pieces 2017-04-26 11:45:54 -04:00
Joel Bender
01e71921ed remove error check, fix names #124 2017-04-21 23:11:59 -04:00
Joel Bender
32db81ed88 update bit string lenghts, closes #121 2017-04-07 19:01:31 -04:00
Joel Bender
e24ddfb4d6 bump the version for the next release 2017-03-27 23:19:13 -04:00
Joel Bender
9cbebd9a91 merge #112 to be released 2017-03-25 22:29:23 -04:00
Joel Bender
89dc240701 bringing doc branch up to date 2017-03-25 00:24:27 -04:00
Joel Bender
8b95e65901 bump the version for the next release 2017-03-25 00:15:49 -04:00
Joel Bender
856cad7a7b bring the branch for #110 up to date with stage 2017-03-23 23:19:58 -04:00
Joel Bender
3d350f6f00 merge #109 with new sample 2017-03-23 23:01:09 -04:00
Joel Bender
a313546196 merge #111 2017-03-23 22:52:29 -04:00
Joel Bender
d7d096ec47 add sigterm and sigusr1 parameters to run, move the stop() and print_stack() functions up, remove code attaching signal handlers at import time 2017-03-21 10:01:45 -04:00
Joel Bender
3be5db8423 patch provided in #111 2017-03-15 01:00:45 -04:00
Joel Bender
54d0f4430b handle no broadcast available in interface (loopback) 2017-03-10 00:41:06 -05:00
Joel Bender
ec01d22eae first crack at supporting interface names 2017-03-10 00:39:35 -05:00
Joel Bender
8db3db25cf propagate the device information cache in the BIPForeignApplication like it does in the BIPSimpleApplication, should fix #109 2017-03-09 11:22:07 -05:00
Joel Bender
836983a1a4 check for limits parameter (untested) 2017-03-08 08:11:59 -05:00
Joel Bender
f2c7d3fe47 bringing branch up-to-date with stage 2017-03-07 18:11:50 -05:00
Joel Bender
363f61242c merging issue branch, closes #107 2017-03-07 17:55:19 -05:00
Joel Bender
66c4eebf55 add the close_socket() function requested in #107 2017-03-03 23:43:05 -05:00
Joel Bender
afcda0d730 weird character snuck in via copy/paste 2017-02-28 10:55:34 -05:00
Joel Bender
49c50f5bd0 additional units submitted in #106 2017-02-27 21:59:11 -05:00
Joel Bender
c795e3b0f0 wrong syntax 2017-02-27 21:35:03 -05:00
Joel Bender
7e544ec637 trap invlid tag in sub-elements, needs testing 2017-02-27 21:24:39 -05:00
Joel Bender
e75257c7d0 allow the INI file name to be specified in the environment 2017-02-24 09:40:00 -05:00
Joel Bender
f6a235d4b1 wrong abort function name (old code hotfix) 2017-02-21 23:39:55 -05:00
Joel Bender
132820c66d wrong abort function name (old code hotfix) 2017-02-21 23:30:57 -05:00
Joel Bender
a1054e1678 add BACPYPES_COLOR optional environment variable to match BACPYPES_DEBUG 2017-01-11 15:54:47 -05:00
Joel Bender
78032e5a43 bump the version for the next release 2016-12-23 09:44:24 -05:00
Joel Bender
cf33aa1c8e Merge branch 'issue-87' into stage 2016-11-30 20:23:00 -05:00
Karol Gil
4c9a2152c1 Issue #99 - fix proposal 2016-11-18 08:46:42 +01:00
Christian Tremblay
820c03e8dd Merge branch 'issue-87' of https://github.com/JoelBender/bacpypes into issue-87
Conflicts:
	py25/bacpypes/app.py
	py27/bacpypes/app.py
	py34/bacpypes/app.py
	samples/SampleConsoleCmd-A.py

Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
2016-11-15 22:39:59 -05:00
Christian Tremblay
70abd268ab Typo : source_address instead of address
Signed-off-by: Christian Tremblay <christian.tremblay@servisys.com>
2016-11-15 21:29:15 -05:00
Joel Bender
e322d4350c a little extra type checking 2016-11-14 22:31:48 -05:00
Joel Bender
39169bd5d7 bug with stream and record file initialization, clean up sample applications 2016-11-14 21:35:30 -05:00
Joel Bender
d610556112 missing import 2016-11-14 00:19:37 -05:00
Joel Bender
2f8f147517 trap the invalid array index 2016-11-14 00:18:30 -05:00
Joel Bender
ba31af7849 check for debugging 2016-11-14 00:17:25 -05:00
Joel Bender
2187bac5f8 use the new API 2016-11-11 00:14:46 -05:00
Joel Bender
418115fc7a sync the versions 2016-11-10 22:39:29 -05:00
Joel Bender
cb2449b5ad rename the internal fn from _confirmation_complete to _app_complete 2016-11-10 09:06:02 -05:00
Joel Bender
12589fe7af improve the isolation of layers between the Application and an IOController 2016-11-10 00:53:19 -05:00
Joel Bender
cdac3f1b10 sync changes across versions 2016-11-07 23:37:46 -05:00
Joel Bender
233486d0a2 remove obnoxious trailing blanks 2016-11-07 22:45:32 -05:00
Joel Bender
cf1a669ab0 synchronize the API update addPeer to add_actor, etc, across versions and sample code 2016-11-04 23:58:26 -04:00
Joel Bender
755b21d692 change the add/delete peer API to add/delete actor 2016-11-04 08:17:37 -04:00
Joel Bender
52c84afa58 the getsockopt() function is of the socket 2016-10-27 14:56:22 -04:00
Joel Bender
e847d876dd PDU data to/from TCP is bytes, request buffer must also be bytes 2016-10-26 20:43:18 -04:00
Joel Bender
34c492617e add the serialNumber property to the device object 2016-10-26 20:23:53 -04:00
Joel Bender
a6f197cf03 define handle_error function to match TCP api 2016-10-26 20:18:56 -04:00
Joel Bender
1864cc5422 be more explicit with bytes in upstream and downstream PDUs 2016-10-26 14:24:36 -04:00
Joel Bender
9b288405ef better handling of ctor order, use None in PDU ctor 2016-10-26 14:11:20 -04:00
Joel Bender
bbf4b25234 fix the API to match the tcp module 2016-10-26 01:57:30 -04:00
Joel Bender
ac3d56f18e change from passing exceptions up the stack (which mever seemed right) to passing them to the application service element via the director 2016-10-26 01:43:57 -04:00
Joel Bender
e7bf984798 more tcp stream error handling 2016-10-23 01:33:07 -04:00
Joel Bender
99996a73fa send IOError exceptions upstream 2016-10-20 16:11:08 -04:00
Joel Bender
a021cfc2e2 debugging output cleanup 2016-10-20 10:34:13 -04:00
Joel Bender
bde964e211 clean up the ClientController and write some docs 2016-10-07 15:14:20 -04:00
Joel Bender
970ed8f7f0 new SieveClientController class for other protocol libs (like MODpypes) 2016-10-06 09:42:23 -04:00
Joel Bender
c57a325920 newline at end of file weirdness 2016-09-20 20:42:09 -04:00
Joel Bender
aa1ec81643 sync changes, clean up names, more testing 2016-09-17 02:12:14 -04:00
Joel Bender
ac36e50324 make sure subscriptions are no longer scheduled when they are canceled 2016-09-16 14:52:12 -04:00
Joel Bender
458c954523 raise execution errors rather than Error objects -- forgot my own API :-) 2016-09-16 11:27:34 -04:00
Joel Bender
b3fec6220e trigger the task manager event when deferred is called to break the asyncore loop 2016-09-16 11:26:16 -04:00
Joel Bender
b07033d258 essentially a new module using detect 2016-09-16 01:36:48 -04:00
Joel Bender
04e18c35af add a detect module 2016-09-16 01:34:02 -04:00
Joel Bender
8e9869c13c enable debugging for deferred() 2016-09-16 01:32:42 -04:00
Joel Bender
06ca93d9c7 clean up names, sync python versions 2016-09-14 22:17:07 -04:00
Joel Bender
af9fd7ead1 hacks and such 2016-09-14 18:20:51 -04:00
Joel Bender
53a95da5b0 split object services from .service.device to .service.object, sync versions, clean up flakes 2016-09-10 20:41:04 -04:00
Joel Bender
c57514b7a9 bump the version number for the API change and include the new modules 2016-09-06 10:34:27 -04:00
Joel Bender
0b05daa93c synchronize all the codes 2016-09-02 23:31:35 -04:00
Joel Bender
0fdc4040f4 update to the new framework 2016-08-30 22:28:14 -04:00
Joel Bender
92a376a68a switch to using IOCBs 2016-08-30 16:44:29 -04:00
Joel Bender
065e385670 clean up i_am() and i_have() functions, raise ExecutionError rather than Error 2016-08-30 15:07:33 -04:00
Joel Bender
f83e6106bb fix the trigger function name, make controller registration explicit 2016-08-30 15:05:06 -04:00
Joel Bender
a8f29e915a separate the upstream traffic into responses and errors by PDU type, minor documentation 2016-08-30 15:03:18 -04:00
Joel Bender
1a9f06fd51 many changes 2016-08-30 02:25:32 -04:00
Joel Bender
1fa3fd1c76 first crack at COV service module -- needs help 2016-08-29 16:41:14 -04:00
Joel Bender
147b29c79a strip out unused imports, remove localAddress from application layer with a deprecation warning, add local address to BIP in case it's needed by other applications 2016-08-29 16:40:12 -04:00
Joel Bender
431eaebe36 move the read/write property services 2016-08-28 18:18:22 -04:00
Joel Bender
3f78fb8adf file and device services, untested 2016-08-28 01:52:51 -04:00
Joel Bender
2b00378904 simplify the error handling and update the API 2016-08-27 18:51:25 -04:00
Joel Bender
40a9a7892d add the capabillity module and tests 2016-08-27 18:49:56 -04:00
Joel Bender
8253619349 merge in stage (with the next release) and keep going 2016-08-26 15:33:06 -04:00
Joel Bender
08b16d5122 ready for the next release 2016-08-26 15:31:57 -04:00
Joel Bender
68463cdd81 missed keeping track of the maximum APDU length accepted 2016-08-26 13:57:42 -04:00
Joel Bender
9fa5b749f9 remove the localDevice dependancy and shift settings over to the state machine access point 2016-08-26 13:42:08 -04:00
Joel Bender
b5671a18c8 return the default value to what's in clause 12.11.27 (hotfix) 2016-08-26 11:07:55 -04:00
Joel Bender
2a623aff98 update the maxSegmentsAccepted in the segmentation state machine when the device supports segmentation 2016-08-26 09:28:36 -04:00
Joel Bender
20a0e6a79f bring branch up to date with stage 2016-08-26 07:44:23 -04:00
Joel Bender
25ddfe1ef3 fix the max APDU length accepted encoding (check was in the wrong direction), make sure the local device has a value that is at least 50 2016-08-26 00:25:50 -04:00
Joel Bender
100aabae2a work in progress 2016-08-25 22:31:14 -04:00
Joel Bender
af6f1cec68 create the service subpackage and a test module in it 2016-08-25 17:24:59 -04:00
Joel Bender
c669b87daa extended debugging #76 works as intended 2016-08-25 12:17:08 -04:00
Joel Bender
122fd355ae tell the cache the device info has been updated when the incoming request APCI fields are inconsistent with the device info (hotfix) 2016-08-25 10:07:40 -04:00
Joel Bender
6a530b3c38 get ready for the next release 2016-08-25 09:34:49 -04:00
Joel Bender
3d18cf1f85 wrote some tests, found a bug 2016-08-24 10:45:35 -04:00
Joel Bender
ac6fb33e5f merge in hotfix changes from master -- no differences 2016-08-24 10:05:03 -04:00
Joel Bender
14b23d7755 clean up debugging code, better code for dumping objects 2016-08-24 09:43:28 -04:00
Joel Bender
05b1d44fac set the application service retry settings 2016-08-23 17:07:04 -04:00
Joel Bender
aecb06c727 fix the names of the encode and decode functions 2016-08-23 16:17:04 -04:00
Joel Bender
a7868cfc63 synchronize fixes across source directories, remove flakes, decorate is_valid() as a class method and not a static method 2016-08-23 14:03:07 -04:00
Joel Bender
6ecb67883d do not prematurely remove references to the access point and device information 2016-08-23 10:37:48 -04:00
Joel Bender
168e32fc79 merge in stage to bring branch up-to-date for testing 2016-08-22 00:03:53 -04:00
Joel Bender
73bf17f453 resultBlock parameter in ack is also optional #86 2016-07-08 16:32:31 -04:00
Bob Fox
b608859e1b make Service Parameters optional for ConfirmedPrivateTransferRequest 2016-07-07 15:07:48 -05:00
Joel Bender
2236858d89 use new formatting functions to minimize the differences with Python 3 2016-06-24 16:58:30 -04:00
Joel Bender
38f0c5e441 moving around functionality -- needs more testing, then sync with other python versions 2016-06-23 16:03:49 -04:00
Joel Bender
ebb3970c74 fix device information handling -- needs more testing 2016-06-21 16:40:29 -04:00
Joel Bender
3401e535ab simple typo 2016-06-21 16:39:19 -04:00
Joel Bender
8ab15512b3 update remote device info with APDU fields 2016-06-21 07:33:39 -04:00
Joel Bender
e20d09b195 Merge branch 'KunalSaini-fix/segmentAck' into issue-73 2016-06-17 22:39:08 -04:00
Kunal Saini
bb2d01ba3d Fix segment ack pdu read from network 2016-06-17 11:47:34 -05:00
Joel Bender
6917edd46d bring issue branch up-to-date with stage 2016-05-31 21:26:59 -04:00
Joel Bender
9a0b757c53 Merge branch 'DemandLogic-feature/add-errorclass-communication' into stage 2016-05-31 21:17:42 -04:00
Nils Toedtmann
ef45df9c7a Added ErrorClass 'communication' 2016-05-31 17:59:33 +01:00
Joel Bender
e6f3165757 make some classes new-style so super() works 2016-05-09 00:12:29 -04:00
Joel Bender
ad42e13ce6 catch the decoding error explicitly 2016-05-07 20:25:37 -04:00
Joel Bender
1465deb43e merge in stage and fix conflicts 2016-05-07 16:56:21 -04:00
Joel Bender
3ed5224238 ready for next release 2016-05-05 23:35:34 -04:00
Joel Bender
e80c1ad05a bring the branch up to date before continuing on #58 2016-04-30 23:30:55 -04:00
Joel Bender
d5c08c8a20 move some project metadata - issue #70 2016-04-30 22:01:03 -04:00
Joel Bender
8619522ade check the instance number of objects being added - note this does not apply to the device object 2016-04-29 20:24:52 -04:00
Joel Bender
99cb079492 check the instance number and add a test for it 2016-04-29 20:23:59 -04:00
Joel Bender
7703588ffc pull in issue-45 2016-02-25 01:08:26 -05:00
Joel Bender
f9bb7153df trap lots of decoding errors and turn them into invalid tags 2016-02-25 00:44:17 -05:00
Joel Bender
e6aa4d76be fine tune exceptions raised during decoding 2016-02-25 00:43:25 -05:00
Joel Bender
47ee484d94 trap reject and abort exceptions and turn them into response PDUs 2016-02-25 00:42:30 -05:00
Joel Bender
e6dc749ab9 add more parameter checking to Who-Is execution 2016-02-25 00:41:06 -05:00
Joel Bender
55418c0ef6 make sure all the tags have been consumed or reject it 2016-02-25 00:39:31 -05:00
Joel Bender
48342e0bec closes #66 2016-02-21 14:36:05 -05:00
Joel Bender
aee6c9736e wrong class in debugging statement 2016-02-13 16:15:00 -05:00
Joel Bender
b13d65bbf2 simplify the platform check and add a warning 2016-02-04 14:48:35 -05:00
Joel Bender
f22f345a1d minor debugging 2016-01-31 01:43:21 -05:00
Joel Bender
8e1e2b2cd6 bind the device object to this application 2016-01-31 01:41:56 -05:00
Joel Bender
04a77cbd96 sync the changes from py27 to the others 2016-01-30 14:05:33 -05:00
Joel Bender
c11dec9ca5 defer the call to stop because it may be called before run, depending on threading 2016-01-29 15:29:30 -05:00
Joel Bender
cc3f4babc3 update from previous commits 2016-01-29 15:27:58 -05:00
Joel Bender
e41142a79d reduce the clutter in the debug output of objects 2016-01-29 02:10:48 -05:00
Joel Bender
67ca3d48a2 when the application sends a confirmed service downstream without an invoke ID, give it the one assigned by the lower layers of the stack 2016-01-29 02:10:05 -05:00
Joel Bender
7e0b3a627a rip out the allow_exec from consolecmd with extreme prejudice 2016-01-28 15:10:35 -05:00
Joel Bender
f4afe0ce19 check to see if the application is running interactively (using isatty) and be a little quieter 2016-01-28 14:13:28 -05:00
Joel Bender
461f1f79f6 bring samples branch up-to-date with stage 2016-01-27 16:55:53 -05:00
Joel Bender
214e8b97ee update tcp contents from strings to bytes, add some debugging to find the problem, changed internal 'Chop' function to 'chop' 2016-01-23 21:27:37 -05:00
Joel Bender
36a2aa754a match darwin as well as linux for triggers, which fixes a really irritating bug in MacOS that kept applications from quitting correctly and they would have to be killed 2016-01-23 21:22:21 -05:00
Joel Bender
b065f5fb24 minor debugging addition 2016-01-23 21:20:23 -05:00
Joel Bender
1bcb93ba3d minor debugging addition 2016-01-23 21:19:31 -05:00
Joel Bender
a2fe66ad00 hooks in the application to set/clear the _app value in the object 2016-01-23 21:18:34 -05:00
Joel Bender
da161c0203 objects get a new attribute that references the application stack they belong to 2016-01-23 21:17:18 -05:00
Joel Bender
96fb40ee8a the issueConfirmedNotifications and lifetime are optional 2016-01-23 21:12:35 -05:00
Joel Bender
ac4cb8bd99 patch for #65 2015-12-16 14:34:22 -05:00
Joel Bender
539e199470 mini-language parser to create tag lists 2015-11-18 01:48:22 -05:00
Joel Bender
1bd0fb4a23 more type checking for writing property values when using WriteProperty(), and fewer when setting them directly using 'obj.prop = value' in applications 2015-11-03 22:48:05 -05:00
Joel Bender
06fb7a87a2 add the is_valid static method to the atomic types (and the experimental coerce class method) 2015-11-03 22:45:08 -05:00
Joel Bender
21c819af72 merging issue-63 (#63) into stage, checking on a routing problem (issue not created yet) 2015-11-02 15:27:29 -05:00
Joel Bender
a85f67699b synchronize changes with other versions 2015-10-28 22:13:16 -04:00
Joel Bender
412f1da368 unpack addresses coming downstream rather than assuming they have been created as IP addresses 2015-10-20 16:54:52 -04:00
Joel Bender
b1ed353950 fix the _barf class to eat any __init__() parameters 2015-09-29 19:50:18 -04:00
Joel Bender
5e9f5ea693 a little more debugging, starting on the next layer 2015-09-28 20:51:31 -04:00
Joel Bender
535f420d94 raise the new InvalidTag exception in the decode() functions of the primitive data types 2015-09-25 22:25:20 -04:00
Joel Bender
a344b188c2 first add the classes to the errors module 2015-09-21 22:42:48 -04:00
Joel Bender
4c45c8d70a rather than installing the task, ask the task to install itself 2015-09-17 09:49:06 -04:00
Joel Bender
c63f0d4996 add some debugging 2015-09-16 22:30:30 -04:00
Joel Bender
da236c0486 add get_services_supported() function 2015-09-15 00:35:51 -04:00
Joel Bender
e4a89fa574 add the 'writeGroup' services supported enumeration 2015-09-14 23:39:57 -04:00
Joel Bender
305bf298b7 remove the registration of AuthenticateRequest, AuthenticateACK, and RequestKeyRequest (but leave the definitions, just in case), add the 'writeGroup' services supported enumeration, expand the service choice enumerations rather than leaving them to be expanded on demand 2015-09-14 23:38:17 -04:00
Joel Bender
dec01bcdab more error checking - see issue #57 2015-09-07 22:08:56 -04:00
Joel Bender
ccd7558476 slightly more restrictive month test, disallow '00' 2015-09-07 21:58:38 -04:00
Joel Bender
72fdddaf33 double check day-of-week value, even though it shouldn't match 2015-09-07 21:55:21 -04:00
Joel Bender
1d9ea1bc73 allow explicit 255 for day 2015-09-07 21:26:07 -04:00
Joel Bender
0b94ac7d80 allow explicit 255 for month 2015-09-07 21:23:27 -04:00
Joel Bender
f8a9ee5bd6 check for a valid year, raise ValueError for invalid days and months 2015-09-07 21:20:10 -04:00
Joel Bender
0a40541576 manually merge in the appropriate differences between issue-38 and issue-48 2015-09-06 00:46:59 -04:00
Joel Bender
b5d2b56191 make the str() of a CharacterString more closely match an OctetString because the strValue is an octet string 2015-09-05 23:56:56 -04:00
Joel Bender
b468f724b8 manually merge in fixes already in stage 2015-09-05 23:24:33 -04:00
Joel Bender
d6c5a4c8e5 fixed the type test in py25 and py27 2015-08-20 23:18:25 -04:00
Joel Bender
11caa8a18a add __lt__ function to make tasks orderable (so heappush is happy in py34), update metaclass syntax in py34 singleton 2015-08-09 23:26:03 -04:00
Joel Bender
bbcf3c2bc0 synchronize task changes with other sources 2015-08-09 22:09:11 -04:00
Joel Bender
9300a483d1 still working time machine simulator 2015-08-07 17:02:31 -04:00
Joel Bender
9e72caa716 shuffling test components around, adding additional state machine tests 2015-08-06 23:45:03 -04:00
Joel Bender
181e224ae0 a little better parameter type checking, a lot more tests 2015-08-03 14:29:58 -04:00
Joel Bender
4570f1dbfc merge resolved - testing in wrong branch 2015-08-03 01:03:17 -04:00
Joel Bender
7f80cc43d8 merge resolved 2015-08-03 00:52:23 -04:00
Joel Bender
9c8ec37938 change all the signed octet pack/unpack to unsigned 2015-08-02 23:12:58 -04:00
Joel Bender
85a8ce9558 fixes #10 2015-08-02 22:17:11 -04:00
Joel Bender
fdfcf23fbf message type field is unsigned 2015-07-31 22:42:21 -04:00
Joel Bender
263853760c backport changes to py25 and py27 2015-07-31 21:42:42 -04:00
Joel Bender
37ae6d00f6 working on issue 5 2015-07-30 23:16:55 -04:00
Joel Bender
fb192ea623 fixes #4 2015-07-23 13:44:19 -04:00
Joel Bender
e7d315ef8b in theory fixes #3 2015-07-23 02:42:17 -04:00
Joel Bender
1305d12017 remove flakes 2015-07-17 09:45:39 -04:00
Joel Bender
f0af96c55b remove flakes 2015-07-17 09:24:05 -04:00
Joel Bender
4a7870ae12 removing flakes 2015-07-16 17:01:44 -04:00
Joel Bender
72ff10a79e removing flakes 2015-07-16 16:53:21 -04:00