diff options
author | Andreas Ebner <pansy007@googlemail.com> | 2019-08-21 17:45:02 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-10-07 12:17:29 +0200 |
commit | 418b7f2cef91e344672edf3926b82a5a3043e9ba (patch) | |
tree | 26db9ebc24e8c6e9acc7fab4635205aa65969896 /src/credential/test_credential_bi_and.sh | |
parent | 6ad2e1f1dce42e5c998425e80f48d512638e278e (diff) | |
download | gnunet-418b7f2cef91e344672edf3926b82a5a3043e9ba.tar.gz gnunet-418b7f2cef91e344672edf3926b82a5a3043e9ba.zip |
Cleanup and fixes regarding bidirectional search and the test.sh files:
- removed set_entries_head/tail from DQ entry (no longer needed, using vrh->dsq_head/tail for everything)
- removed no longer required vrh->root_set (not working with forward search anyways as there are multiple root sets)
- implemented cleanup for the dq entries in the queue_entries_head list of ds entries
- added the part in cleanup handling the subject_attribute/_len to might help solve the last valgrind error (didnt work)
- changed the way the ds_entry are inserted in the vrh->dsq_.. list: Now after creation of EVERY ds_entry it is inserted
--> This solved an error resulting from uncanceled lookup_response handles
- changed the test_credential...bi..sh files:
+ "- -" at the end of the collect statement, required for MacOS
+ fixed cleanup at the end to correctly remove entries from GNS
Diffstat (limited to 'src/credential/test_credential_bi_and.sh')
-rwxr-xr-x | src/credential/test_credential_bi_and.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/credential/test_credential_bi_and.sh b/src/credential/test_credential_bi_and.sh index c69aea53f..b5b55031c 100755 --- a/src/credential/test_credential_bi_and.sh +++ b/src/credential/test_credential_bi_and.sh | |||
@@ -70,20 +70,18 @@ gnunet-namestore -D -z h | |||
70 | # Starting to resolve | 70 | # Starting to resolve |
71 | echo "+++ Starting to Resolve +++" | 71 | echo "+++ Starting to Resolve +++" |
72 | 72 | ||
73 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_credential_lookup.conf | paste -d, -s` | 73 | DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=f --forward --backward -c test_credential_lookup.conf | paste -d, -s - -` |
74 | echo $DELS | 74 | echo $DELS |
75 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf | 75 | echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate=\'$DELS\' --forward --backward -c test_credential_lookup.conf |
76 | RES_DELS=`gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_credential_lookup.conf` | 76 | RES_DELS=`gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$FKEY --delegate="$DELS" --forward --backward -c test_credential_lookup.conf` |
77 | 77 | ||
78 | # Cleanup properly | 78 | # Cleanup properly |
79 | gnunet-namestore -z epub -d -n $DISC_ATTR -t ATTR -c test_credential_lookup.conf | 79 | gnunet-namestore -z a -d -n "a" -t ATTR -c test_credential_lookup.conf |
80 | gnunet-namestore -z eorg -d -n $PREF_ATTR -t ATTR -c test_credential_lookup.conf | 80 | gnunet-namestore -z b -d -n "b" -t ATTR -c test_credential_lookup.conf |
81 | gnunet-namestore -z stateu -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf | 81 | gnunet-namestore -z g -d -n "g" -t ATTR -c test_credential_lookup.conf |
82 | #gnunet-namestore -z a -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf | 82 | gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf |
83 | #gnunet-namestore -z d -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf | 83 | gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf |
84 | #gnunet-namestore -z e -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf | 84 | gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf |
85 | #gnunet-namestore -z f -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf | ||
86 | #gnunet-namestore -z g -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf | ||
87 | 85 | ||
88 | gnunet-arm -e -c test_credential_lookup.conf | 86 | gnunet-arm -e -c test_credential_lookup.conf |
89 | 87 | ||