projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure all SPTPS functions are prefixed with sptps_.
[tinc]
/
src
/
sptps_test.c
diff --git
a/src/sptps_test.c
b/src/sptps_test.c
index
6ab7dac
..
06d8dea
100644
(file)
--- a/
src/sptps_test.c
+++ b/
src/sptps_test.c
@@
-118,7
+118,7
@@
int main(int argc, char *argv[]) {
fprintf(stderr, "Keys loaded\n");
sptps_t s;
fprintf(stderr, "Keys loaded\n");
sptps_t s;
- if(!s
tart_sptps
(&s, &sock, initiator, mykey, hiskey, "sptps_test", 10, send_data, receive_record))
+ if(!s
ptps_start
(&s, &sock, initiator, mykey, hiskey, "sptps_test", 10, send_data, receive_record))
return 1;
while(true) {
return 1;
while(true) {
@@
-141,11
+141,11
@@
int main(int argc, char *argv[]) {
if(len == 0)
break;
if(buf[0] == '^')
if(len == 0)
break;
if(buf[0] == '^')
- send_record(&s, SPTPS_HANDSHAKE, NULL, 0);
+ s
ptps_s
end_record(&s, SPTPS_HANDSHAKE, NULL, 0);
else if(buf[0] == '$')
else if(buf[0] == '$')
- force_kex(&s);
+
sptps_
force_kex(&s);
else
else
- if(!send_record(&s, buf[0] == '!' ? 1 : 0, buf, buf[0] == '\n' ? 0 : buf[0] == '*' ? sizeof buf : len))
+ if(!s
ptps_s
end_record(&s, buf[0] == '!' ? 1 : 0, buf, buf[0] == '\n' ? 0 : buf[0] == '*' ? sizeof buf : len))
return 1;
}
return 1;
}
@@
-162,10
+162,13
@@
int main(int argc, char *argv[]) {
char hex[len * 2 + 1];
bin2hex(buf, hex, len);
fprintf(stderr, "Received %zd bytes of data:\n%s\n", len, hex);
char hex[len * 2 + 1];
bin2hex(buf, hex, len);
fprintf(stderr, "Received %zd bytes of data:\n%s\n", len, hex);
- if(!receive_data(&s, buf, len))
+ if(!
sptps_
receive_data(&s, buf, len))
return 1;
}
}
return 1;
}
}
+ if(!sptps_stop(&s))
+ return 1;
+
return 0;
}
return 0;
}