ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-05-02 08:42:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix broken 'rhizomeprotocol' tests on Solaris

Browse Source
This commit is contained in:
Andrew Bettison 2012-09-27 15:14:43 +09:30
parent 45e3d1d078
commit ca6d8f487d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
overlay_packetformats.c
View File

@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "serval.h" #include "serval.h"
#include "strbuf.h" #include "strbuf.h"
struct sockaddr_in loopback = { struct sockaddr_in loopback;
.sin_family=0,
.sin_port=0,
.sin_addr.s_addr=0x0100007f
};
int packetOkOverlay(struct overlay_interface *interface,unsigned char *packet, size_t len, int packetOkOverlay(struct overlay_interface *interface,unsigned char *packet, size_t len,
unsigned char *transaction_id,int recvttl, unsigned char *transaction_id,int recvttl,
@ -90,10 +86,12 @@ int packetOkOverlay(struct overlay_interface *interface,unsigned char *packet, s
f.recvaddr=recvaddr; f.recvaddr=recvaddr;
if (debug&DEBUG_OVERLAYFRAMES) if (debug&DEBUG_OVERLAYFRAMES)
DEBUG("Received overlay packet"); DEBUG("Received overlay packet");
} else { } else {
if (interface->fileP) { if (interface->fileP) {
/* dummy interface, so tell to use 0.0.0.0 */ /* dummy interface, so tell to use localhost */
loopback.sin_family = AF_INET;
loopback.sin_port = 0;
loopback.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
f.recvaddr=(struct sockaddr *)&loopback; f.recvaddr=(struct sockaddr *)&loopback;
} else } else
/* some other sort of interface, so we can't offer any help here */ /* some other sort of interface, so we can't offer any help here */

2
tests/rhizomeprotocol
View File

@ -107,7 +107,7 @@ update_file() {
[ -e "$new_name" ] || echo 'File $new_name' >"$new_name" [ -e "$new_name" ] || echo 'File $new_name' >"$new_name"
local sidvar="SID$instance_name" local sidvar="SID$instance_name"
[ "$new_name" != "$orig_name" ] && cp "$orig_name.manifest" "$new_name.manifest" [ "$new_name" != "$orig_name" ] && cp "$orig_name.manifest" "$new_name.manifest"
sed -i -e '/^date=/d;/^filehash=/d;/^filesize=/d;/^version=/d;/^name=/d' "$new_name.manifest" $SED -i -e '/^date=/d;/^filehash=/d;/^filesize=/d;/^version=/d;/^name=/d' "$new_name.manifest"
executeOk_servald rhizome add file "${!sidvar}" '' "$new_name" "$new_name.manifest" executeOk_servald rhizome add file "${!sidvar}" '' "$new_name" "$new_name.manifest"
executeOk_servald rhizome list '' executeOk_servald rhizome list ''
assert_rhizome_list "$new_name" assert_rhizome_list "$new_name"