git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing include.
[stg.git]
/
projects
/
stargazer
/
plugins
/
other
/
smux
/
utils.cpp
diff --git
a/projects/stargazer/plugins/other/smux/utils.cpp
b/projects/stargazer/plugins/other/smux/utils.cpp
index 8d3988eb088dec3b24f2423b4fa19666377a41d0..3160bc5fcf6c33b5bc1d6729c80fb74e2a8f3f21 100644
(file)
--- a/
projects/stargazer/plugins/other/smux/utils.cpp
+++ b/
projects/stargazer/plugins/other/smux/utils.cpp
@@
-44,7
+44,7
@@
if (left < str.length())
}
arcs[arcPos++] = arc;
}
}
arcs[arcPos++] = arc;
}
-OBJECT_IDENTIFIER_set_arcs(oi, arcs, sizeof(arcs[0]),
arcPos
);
+OBJECT_IDENTIFIER_set_arcs(oi, arcs, sizeof(arcs[0]),
static_cast<unsigned int>(arcPos)
);
return true;
}
return true;
}
@@
-101,12
+101,16
@@
if (error.encoded == -1)
}
else
{
}
else
{
- write(fd, buffer, error.encoded);
+ if (write(fd, buffer, error.encoded) < 0)
+ {
+ printfd(__FILE__, "Failed to send OpenPDU: %s\n", strerror(errno));
+ return false;
+ }
}
return true;
}
}
return true;
}
-
int
SendClosePDU(int fd)
+
bool
SendClosePDU(int fd)
{
ClosePDU_t msg;
{
ClosePDU_t msg;
@@
-124,16
+128,20
@@
if (error.encoded == -1)
{
printfd(__FILE__, "Could not encode ClosePDU (at %s)\n",
error.failed_type ? error.failed_type->name : "unknown");
{
printfd(__FILE__, "Could not encode ClosePDU (at %s)\n",
error.failed_type ? error.failed_type->name : "unknown");
- return
-1
;
+ return
false
;
}
else
{
}
else
{
- write(fd, buffer, error.encoded);
+ if (write(fd, buffer, error.encoded) < 0)
+ {
+ printfd(__FILE__, "Failed to send ClosePDU: %s\n", strerror(errno));
+ return false;
+ }
}
}
-return
0
;
+return
true
;
}
}
-
int
SendRReqPDU(int fd)
+
bool
SendRReqPDU(int fd)
{
int oid[] = {1, 3, 6, 1, 4, 1, 38313, 1};
asn_enc_rval_t error;
{
int oid[] = {1, 3, 6, 1, 4, 1, 38313, 1};
asn_enc_rval_t error;
@@
-157,13
+165,17
@@
if (error.encoded == -1)
{
printfd(__FILE__, "Could not encode RReqPDU (at %s)\n",
error.failed_type ? error.failed_type->name : "unknown");
{
printfd(__FILE__, "Could not encode RReqPDU (at %s)\n",
error.failed_type ? error.failed_type->name : "unknown");
- return
-1
;
+ return
false
;
}
else
{
}
else
{
- write(fd, buffer, error.encoded);
+ if (write(fd, buffer, error.encoded) < 0)
+ {
+ printfd(__FILE__, "Failed to send RReqPDU: %s\n", strerror(errno));
+ return false;
+ }
}
}
-return
0
;
+return
true
;
}
SMUX_PDUs_t * RecvSMUXPDUs(int fd)
}
SMUX_PDUs_t * RecvSMUXPDUs(int fd)
@@
-188,7
+200,7
@@
if(error.code != RC_OK)
return pdus;
}
return pdus;
}
-
int
SendGetResponsePDU(int fd, GetResponse_PDU_t * getResponse)
+
bool
SendGetResponsePDU(int fd, GetResponse_PDU_t * getResponse)
{
asn_enc_rval_t error;
{
asn_enc_rval_t error;
@@
-200,19
+212,23
@@
if (error.encoded == -1)
{
printfd(__FILE__, "Could not encode GetResponsePDU (at %s)\n",
error.failed_type ? error.failed_type->name : "unknown");
{
printfd(__FILE__, "Could not encode GetResponsePDU (at %s)\n",
error.failed_type ? error.failed_type->name : "unknown");
- return
-1
;
+ return
false
;
}
else
{
}
else
{
- write(fd, buffer, error.encoded);
+ if (write(fd, buffer, error.encoded) < 0)
+ {
+ printfd(__FILE__, "Failed to send GetResponsePDU: %s\n", strerror(errno));
+ return false;
+ }
}
}
-return
0
;
+return
true
;
}
}
-
int
SendGetResponseErrorPDU(int fd,
- const PDU_t * getRequest,
- int errorStatus,
- int errorIndex)
+
bool
SendGetResponseErrorPDU(int fd,
+
const PDU_t * getRequest,
+
int errorStatus,
+
int errorIndex)
{
asn_enc_rval_t error;
GetResponse_PDU_t msg;
{
asn_enc_rval_t error;
GetResponse_PDU_t msg;
@@
-235,11
+251,15
@@
if (error.encoded == -1)
{
printfd(__FILE__, "Could not encode GetResponsePDU for error (at %s)\n",
error.failed_type ? error.failed_type->name : "unknown");
{
printfd(__FILE__, "Could not encode GetResponsePDU for error (at %s)\n",
error.failed_type ? error.failed_type->name : "unknown");
- return
-1
;
+ return
false
;
}
else
{
}
else
{
- write(fd, buffer, error.encoded);
+ if (write(fd, buffer, error.encoded) < 0)
+ {
+ printfd(__FILE__, "Failed to send GetResponseErrorPDU: %s\n", strerror(errno));
+ return false;
+ }
}
}
-return
0
;
+return
true
;
}
}