Seich
/
HomeSpan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactored tlvRespond() to use hapOut instead of sendEncrypted() 

To do:

1) update putPrepareURL() to use hapOut instead of sendEncrypted()
2) remove sendEncrypted() since it is no longer needed
3) try moving MAllocator template into separate file (memory.h?) so it can be called from any other module
4) remove #include "HomeSpan.h" from TLV8
This commit is contained in:
Gregg 2024-01-10 21:53:37 -06:00
parent fa5455d6f9
commit bddffab7ad
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/HAP.cpp
View File

@ -334,7 +334,8 @@ int HAPClient::postPairSetupURL(uint8_t *content, size_t len){
HAPTLV subTLV; HAPTLV subTLV;
iosTLV.unpack(content,len); iosTLV.unpack(content,len);
iosTLV.print(); if(homeSpan.getLogLevel()>1)
iosTLV.print();
LOG2("------------ END TLVS! ------------\n"); LOG2("------------ END TLVS! ------------\n");
LOG1("In Pair Setup #%d (%s)...",conNum,client.remoteIP().toString().c_str()); LOG1("In Pair Setup #%d (%s)...",conNum,client.remoteIP().toString().c_str());
@ -478,7 +479,8 @@ int HAPClient::postPairSetupURL(uint8_t *content, size_t len){
} }
subTLV.unpack(decrypted,decrypted.len()); // unpack TLV subTLV.unpack(decrypted,decrypted.len()); // unpack TLV
subTLV.print(); // print decrypted TLV data if(homeSpan.getLogLevel()>1)
subTLV.print(); // print decrypted TLV data
LOG2("---------- END SUB-TLVS! ----------\n"); LOG2("---------- END SUB-TLVS! ----------\n");
@ -536,7 +538,8 @@ int HAPClient::postPairSetupURL(uint8_t *content, size_t len){
LOG2("------- ENCRYPTING SUB-TLVS -------\n"); LOG2("------- ENCRYPTING SUB-TLVS -------\n");
subTLV.print(); if(homeSpan.getLogLevel()>1)
subTLV.print();
TempBuffer<uint8_t> subPack(subTLV.pack_size()); // create sub-TLV by packing Identifier, PublicKey and Signature TLV records together TempBuffer<uint8_t> subPack(subTLV.pack_size()); // create sub-TLV by packing Identifier, PublicKey and Signature TLV records together
subTLV.pack(subPack); subTLV.pack(subPack);
@ -581,7 +584,8 @@ int HAPClient::postPairVerifyURL(uint8_t *content, size_t len){
HAPTLV subTLV; HAPTLV subTLV;
iosTLV.unpack(content,len); iosTLV.unpack(content,len);
iosTLV.print(); if(homeSpan.getLogLevel()>1)
iosTLV.print();
LOG2("------------ END TLVS! ------------\n"); LOG2("------------ END TLVS! ------------\n");
LOG1("In Pair Verify #%d (%s)...",conNum,client.remoteIP().toString().c_str()); LOG1("In Pair Verify #%d (%s)...",conNum,client.remoteIP().toString().c_str());
@ -637,7 +641,8 @@ int HAPClient::postPairVerifyURL(uint8_t *content, size_t len){
LOG2("------- ENCRYPTING SUB-TLVS -------\n"); LOG2("------- ENCRYPTING SUB-TLVS -------\n");
subTLV.print(); if(homeSpan.getLogLevel()>1)
subTLV.print();
TempBuffer<uint8_t> subPack(subTLV.pack_size()); // create sub-TLV by packing Identifier and Signature TLV records together TempBuffer<uint8_t> subPack(subTLV.pack_size()); // create sub-TLV by packing Identifier and Signature TLV records together
subTLV.pack(subPack); subTLV.pack(subPack);
@ -686,8 +691,9 @@ int HAPClient::postPairVerifyURL(uint8_t *content, size_t len){
return(0); return(0);
} }
subTLV.unpack(decrypted,decrypted.len()); // unpack TLV subTLV.unpack(decrypted,decrypted.len()); // unpack TLV
subTLV.print(); // print decrypted TLV data if(homeSpan.getLogLevel()>1)
subTLV.print(); // print decrypted TLV data
LOG2("---------- END SUB-TLVS! ----------\n"); LOG2("---------- END SUB-TLVS! ----------\n");
@ -769,7 +775,8 @@ int HAPClient::postPairingsURL(uint8_t *content, size_t len){
HAPTLV responseTLV; HAPTLV responseTLV;
iosTLV.unpack(content,len); iosTLV.unpack(content,len);
iosTLV.print(); if(homeSpan.getLogLevel()>1)
iosTLV.print();
LOG2("------------ END TLVS! ------------\n"); LOG2("------------ END TLVS! ------------\n");
LOG1("In Post Pairings #%d (%s)...",conNum,client.remoteIP().toString().c_str()); LOG1("In Post Pairings #%d (%s)...",conNum,client.remoteIP().toString().c_str());
@ -1307,26 +1314,28 @@ void HAPClient::eventNotify(SpanBuf *pObj, int nObj, int ignoreClient){
void HAPClient::tlvRespond(TLV8 &tlv8){ void HAPClient::tlvRespond(TLV8 &tlv8){
TempBuffer<uint8_t> tBuf(tlv8.pack_size()); // create buffer to hold TLV data tlv8.osprint(hapOut);
tlv8.pack(tBuf); // pack TLV records into buffer size_t nBytes=hapOut.getSize();
hapOut.flush();
char *body;
asprintf(&body,"HTTP/1.1 200 OK\r\nContent-Type: application/pairing+tlv8\r\nContent-Length: %d\r\n\r\n",tBuf.len()); // create Body with Content Length = size of TLV data
char *body;
asprintf(&body,"HTTP/1.1 200 OK\r\nContent-Type: application/pairing+tlv8\r\nContent-Length: %d\r\n\r\n",nBytes); // create Body with Content Length = size of TLV data
LOG2("\n>>>>>>>>>> %s >>>>>>>>>>\n",client.remoteIP().toString().c_str()); LOG2("\n>>>>>>>>>> %s >>>>>>>>>>\n",client.remoteIP().toString().c_str());
LOG2(body); LOG2(body);
tlv8.print(); if(homeSpan.getLogLevel()>1)
tlv8.print();
if(!cPair){ // unverified, unencrypted session hapOut.setHapClient(this);
client.print(body); hapOut << body;
client.write(tBuf,tBuf.len()); tlv8.osprint(hapOut);
hapOut.flush();
if(!cPair)
LOG2("------------ SENT! --------------\n"); LOG2("------------ SENT! --------------\n");
} else { else
sendEncrypted(body,tBuf,tBuf.len()); LOG2("-------- SENT ENCRYPTED! --------\n");
}
free(body);
} // tlvRespond } // tlvRespond
////////////////////////////////////// //////////////////////////////////////

1
src/TLV8.h
View File

@ -29,6 +29,7 @@
#include <sstream> #include <sstream>
#include <forward_list> #include <forward_list>
#include <memory>
#include "HomeSpan.h" #include "HomeSpan.h"