From c8e04709c3941b832261c4eff9dbee058a46c841 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 13 Mar 2012 13:57:50 +0000 Subject: [PATCH] -adding capability to install static list of HELLOs with the original software to avoid need for hostlist server accessibility --- contrib/Makefile.am | 22 ++++++ ...KH7IPB4DMKVRNDJOUHOIBQ2JBIAIOHPSJHUGGBL30O | Bin 0 -> 312 bytes ...IC71608CPU0EB4FRFIDDI15S81G5UC00D7PQKI3JS0 | Bin 0 -> 312 bytes ...TCIQTUEJSRJ9V0IU9TRVTLDUPLNEACRI5BOGQTPC4G | Bin 0 -> 292 bytes ...MNCDUG1SST0HNF40IFEHVAUOVI7AME8T4QPD089H28 | Bin 0 -> 292 bytes ...B1HNNEE7Q830GQJSPM7LBKR1CP4KSMMPQ80M8GSPTG | Bin 0 -> 292 bytes ...I0TMOETLKQQN3K5PGBLKA1O6USS6CEOED75BOEFJ0G | Bin 0 -> 312 bytes ...FUU2OMV082E2VMCOR71ONQBB73IO296RCJHSK73MDO | Bin 0 -> 312 bytes ...JSNR9I7HF0CVPJ6C464EM7LMPTVRPU75MP6OIRJQJ0 | Bin 0 -> 292 bytes ...Q29F7JGPV6VNKG509S048CH31NQH8VIH2T58K8PVM0 | Bin 0 -> 312 bytes ...IAKS4DAE6UFJBO4BRKDLIOI2OVS6J480QLOGIEPRDG | Bin 0 -> 312 bytes ...J8JDLQA5MS09EBVATKUKVFP8RK5Q8QA0LMRIIUTD70 | Bin 0 -> 292 bytes ...P3F4OQC2D21203VECHCKQ95IBUMO6C46SH5MPAO9J8 | Bin 0 -> 312 bytes ...NKLFTRCM7O5AGJPQ3UDD8MST8QQHLNOC4GUL6731O0 | Bin 0 -> 312 bytes src/peerinfo/gnunet-service-peerinfo.c | 72 +++++++++++++++--- 15 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 contrib/hellos/02UKDQ8B827SF4HR5D57BAIQA2A7IJ96EP15APKS08SE6EI90CDM35QAT4135KH7IPB4DMKVRNDJOUHOIBQ2JBIAIOHPSJHUGGBL30O create mode 100644 contrib/hellos/1G1MOK6389P2HV5DUK7RH3BLASHGMMVNUFFC2C26NO93SRSRQBQ9GALGBFMR1IC71608CPU0EB4FRFIDDI15S81G5UC00D7PQKI3JS0 create mode 100644 contrib/hellos/7RAVI0QOIAVHL0TE0F54JQL4FUAEQ8V6PL8U1RNDRMRU33E2HU7D0IUBKUDQGTCIQTUEJSRJ9V0IU9TRVTLDUPLNEACRI5BOGQTPC4G create mode 100644 contrib/hellos/8B4TV9KRVBMHNPFIP8ISM4GRNR8EAJ39JBQNRRE1QRLTLPOQGEV9S9285D9GEMNCDUG1SST0HNF40IFEHVAUOVI7AME8T4QPD089H28 create mode 100644 contrib/hellos/94CH5M5L43QCBDJBPVUA3SJT4L92P8IS3JQ0J3V0EE6QSG9P7OM03KGJD58LNB1HNNEE7Q830GQJSPM7LBKR1CP4KSMMPQ80M8GSPTG create mode 100644 contrib/hellos/ATF475IOUC8E9A6208VK1RP2STLI3J1E7NP1CKAL5O4L3KP65RM20SKTHEBHFI0TMOETLKQQN3K5PGBLKA1O6USS6CEOED75BOEFJ0G create mode 100644 contrib/hellos/F1GTBM1J301AEJNJCMOMGTR3DLRHFOUMOQ504SPSVTBS47AOD4H6GMN46J9UMFUU2OMV082E2VMCOR71ONQBB73IO296RCJHSK73MDO create mode 100644 contrib/hellos/KD9VVK7H5TJII7OEOMCK9AI5H6EKABCO85OHPPEO72T2K6QGE9IG0LUQTOKOSJSNR9I7HF0CVPJ6C464EM7LMPTVRPU75MP6OIRJQJ0 create mode 100644 contrib/hellos/KUPL5G20GSVQQ29GOD7QMTC4IRQ67KGSQ1IOMOIQL7TE78L8UQ2V9SNJQTSIEQ29F7JGPV6VNKG509S048CH31NQH8VIH2T58K8PVM0 create mode 100644 contrib/hellos/LJR8FV49LJJOCPJFS5894IVT9RU10TENLAM1D61J83BQN629NE1OU56GM54DMIAKS4DAE6UFJBO4BRKDLIOI2OVS6J480QLOGIEPRDG create mode 100644 contrib/hellos/R69QGJB2I9T359F3CLA5HDV9NQUDF87FQQH9F8DKIQUCRAQSPJ1FIF3GVL9QIJ8JDLQA5MS09EBVATKUKVFP8RK5Q8QA0LMRIIUTD70 create mode 100644 contrib/hellos/R6OVGTG5M5EKRS0MBLGI5VEOG360RCJS2TCUU7OCTGKN5CSBIGCC7C75IU6J1P3F4OQC2D21203VECHCKQ95IBUMO6C46SH5MPAO9J8 create mode 100644 contrib/hellos/RL7P1AO4M4LOI3JPVER5FJKG6A847K3O86NS4Q07J1721371FO7RB6IFVMNI1NKLFTRCM7O5AGJPQ3UDD8MST8QQHLNOC4GUL6731O0 diff --git a/contrib/Makefile.am b/contrib/Makefile.am index df6bdc275..d5797adb4 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -45,3 +45,25 @@ check_PROGRAMS = \ test_gnunet_prefix_SOURCES = \ test_gnunet_prefix.c + +pkghellodir= $(pkgdatadir)/hellos + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(pkghellodir) + @$(NORMAL_INSTALL) + for hello in $(srcdir)/hellos/*; do \ + if test -f $$hello; then \ + $(INSTALL_DATA) $$hello $(DESTDIR)$(pkghellodir)/ ; \ + fi \ + done + +dist-hook: + if test -d $(srcdir)/hellos; then \ + mkdir -p $(distdir)/hellos; \ + for hello in $(srcdir)/hellos/*; do \ + if test -f $$hello; then \ + cp -p $$hello $(distdir)/hellos; \ + fi \ + done \ + fi + diff --git a/contrib/hellos/02UKDQ8B827SF4HR5D57BAIQA2A7IJ96EP15APKS08SE6EI90CDM35QAT4135KH7IPB4DMKVRNDJOUHOIBQ2JBIAIOHPSJHUGGBL30O b/contrib/hellos/02UKDQ8B827SF4HR5D57BAIQA2A7IJ96EP15APKS08SE6EI90CDM35QAT4135KH7IPB4DMKVRNDJOUHOIBQ2JBIAIOHPSJHUGGBL30O new file mode 100644 index 0000000000000000000000000000000000000000..2454b128a5bdc2b4538856f2b9c963524d650be9 GIT binary patch literal 312 zcmZRyU=Uyc0!B7QhP{f9uBM;xNv|=@5`9)I^H0?~Mq*!l*S_W3dfrrpZ?AKa<9JxE zu*TYQ!?yn4mh9)s1pk~i?7pSO@NE8vvgZqqoIm@-w|1jc?&jGlcfEupjT*1dSJ&Ij zzOvx+wWD#4rrH+&yGq44Bn;M;ta+8zC+GJ_zNzWB#?xsvZSzF_JP`K$ylcmnB7aAQ z-{yiRHNFM%JSh2)CKz^a%Z;<^0tF5(o^_EwqugSh=+q5@ZemMM)c0zAaNw}XebcV? zqq5%U$E=ONton}z&QNtZ*!z=ji+A2a^}^E`(HX8hi<0^)|4ayBnkE$Zh-1F+{TjCA zthQ|TrY?2}X|~`0f?2Q8=9Ln6iYy}|14C&_0RsaYFg(ooUbO`@@6k!)P%BAB5(|Tf F0RT_cg&P0> literal 0 HcmV?d00001 diff --git a/contrib/hellos/1G1MOK6389P2HV5DUK7RH3BLASHGMMVNUFFC2C26NO93SRSRQBQ9GALGBFMR1IC71608CPU0EB4FRFIDDI15S81G5UC00D7PQKI3JS0 b/contrib/hellos/1G1MOK6389P2HV5DUK7RH3BLASHGMMVNUFFC2C26NO93SRSRQBQ9GALGBFMR1IC71608CPU0EB4FRFIDDI15S81G5UC00D7PQKI3JS0 new file mode 100644 index 0000000000000000000000000000000000000000..48d1b34d3b49d1cf96ad9dd694c88829f87b3afb GIT binary patch literal 312 zcmZRyU=Uyc0!B7QhH2}(_KNHKw2S*5(>PWTz3^q$thA<$EAF+w+hV0K{kWFU91c%~ zTW>zD;x#Nb+tqWMZHx1Y+{^Q($NA=NHe$?A*vWT7<|tFZjQSpqyW*T%R&IP=88X{B zeukd%lED1)PmH*`glw}J798Q^u90uFd+V!{_Gjwp*GYRg4rZ%`-LTmIH8%g=k}J0{#J=UJ-@!iUFR0> zXThaUa&8K@$^6#l@|50WF^B6N=VyDboaUd^a)wEHdK1l4)8?Kzo<8m9S0nd3+OE4h ztv>zySl4xb^7EuuAw_&U{~q&MQ8CSxk&%I+G^K!nfejcQW_+*OqFesVILM(^l8hvl H4G{wXocE6D literal 0 HcmV?d00001 diff --git a/contrib/hellos/7RAVI0QOIAVHL0TE0F54JQL4FUAEQ8V6PL8U1RNDRMRU33E2HU7D0IUBKUDQGTCIQTUEJSRJ9V0IU9TRVTLDUPLNEACRI5BOGQTPC4G b/contrib/hellos/7RAVI0QOIAVHL0TE0F54JQL4FUAEQ8V6PL8U1RNDRMRU33E2HU7D0IUBKUDQGTCIQTUEJSRJ9V0IU9TRVTLDUPLNEACRI5BOGQTPC4G new file mode 100644 index 0000000000000000000000000000000000000000..77c48987d591b84a7aaa781d7acc47e3ab8b8b4a GIT binary patch literal 292 zcmV+<0o(ooBmfWq000011_1!^)4VX8dY?*yLr}V`&)eQ{APva#TOySFTk#~U>Ic&y zVf4Uu2LqPd5_Kw?z#?khr(oL|8kR2wGi2!GQzF^^gVOQKO%!N0YaGGt z1lp02+nuRNl?#aucr-2kq1#tc$No*Ex?*VnOm@YyfmOmZ?o7Y9GcIh7rnQV24r+ob zg}LwnJA4bd#&d#MC#bgp0RRAWV{iZf1^@s7HV*2BVr@&ZT?i(FN`@`~ literal 0 HcmV?d00001 diff --git a/contrib/hellos/8B4TV9KRVBMHNPFIP8ISM4GRNR8EAJ39JBQNRRE1QRLTLPOQGEV9S9285D9GEMNCDUG1SST0HNF40IFEHVAUOVI7AME8T4QPD089H28 b/contrib/hellos/8B4TV9KRVBMHNPFIP8ISM4GRNR8EAJ39JBQNRRE1QRLTLPOQGEV9S9285D9GEMNCDUG1SST0HNF40IFEHVAUOVI7AME8T4QPD089H28 new file mode 100644 index 0000000000000000000000000000000000000000..c486e59e7c810dd5ce5558620c43c3bc9396e226 GIT binary patch literal 292 zcmV+<0o(ooBmfWq000011_1!!XW$bOPcAH0@vqbgK7K`-Yd^p*_J)cG17BYY1B(q2 zGs+;ooWxC;cQ7@BBT74;fT@E0ebj8qWA*273x1 zH&dXh-oO7-FimMXxNVdYFGlqJ{bXYh{tE_nBdl{!4`SF(4Q+JHe60nFOYnqZ@I+PrWMlPcuT&UMJvEHDP)Z<;0Y8yT6+j<*yt z-(2gT-PeoQ>G-gR%}5>%Aa4yqv!kUHXqAqtDYCl8y*0#sHR@ieyj+#2drUxbh<?e{Y8M z29A#oWlmkk#wi9yN&T@KDlAR)RXNJ)cQ{*+-`=%i|sgrxU4qzWy3Cg9lcj1M~=~h%MPWg+|>nC z`1ecq)|hMr1T7N(ldm90AhX!T-dcw8k0HKG4iLpz9r0(Qiz$-}EajBD(z6!nxMnSu zp}yF5S&TBntBH%@{gZ{Wty#ug1#egvMj%!>wN*e2Oog=lq+Ya_tAR{5WTx?>d5w?n qK}FY6Pf?#_W{%d~4-Z8F0RRAWV{iZf1^@s7HV*2BWK*dtng}N128Njc literal 0 HcmV?d00001 diff --git a/contrib/hellos/ATF475IOUC8E9A6208VK1RP2STLI3J1E7NP1CKAL5O4L3KP65RM20SKTHEBHFI0TMOETLKQQN3K5PGBLKA1O6USS6CEOED75BOEFJ0G b/contrib/hellos/ATF475IOUC8E9A6208VK1RP2STLI3J1E7NP1CKAL5O4L3KP65RM20SKTHEBHFI0TMOETLKQQN3K5PGBLKA1O6USS6CEOED75BOEFJ0G new file mode 100644 index 0000000000000000000000000000000000000000..6947c4f3cc77fbc1040a445d5123b41d28943a69 GIT binary patch literal 312 zcmZRyU=Uyc0!B7QhQn%M+Y2X62^DSRuqbye%bI*%!C@1#p|t!0L!~E)+J;=J=a^RJ z#m~LvoU+P9BRxTZ$>{x;E9M{M%(~w_$$Gp#$2=uA>c;n^B{NuhvcK7T`!Ctg`awM< z<(X+o^PXS2t=0Bhk9^D&;8A$^Wx@5|zZhbQ^L3skKGHkGrXIKahO?8toA+urv0Lry zWo_$HZUs$qIQ;Gk<4T>M{(h(Rt|rX1ReZkYSGq{Bv(>z<{a0023vAd@I&JGErs~z! z#hG@6MXIJ7U6;Re`MYq-trpGbsM+QDiae(~_L^&=$z{$wSz)+e}z`(!;3=cEDS8XoM^F@?7)Jl>u#Q@YL BgB1V( literal 0 HcmV?d00001 diff --git a/contrib/hellos/F1GTBM1J301AEJNJCMOMGTR3DLRHFOUMOQ504SPSVTBS47AOD4H6GMN46J9UMFUU2OMV082E2VMCOR71ONQBB73IO296RCJHSK73MDO b/contrib/hellos/F1GTBM1J301AEJNJCMOMGTR3DLRHFOUMOQ504SPSVTBS47AOD4H6GMN46J9UMFUU2OMV082E2VMCOR71ONQBB73IO296RCJHSK73MDO new file mode 100644 index 0000000000000000000000000000000000000000..57e95b18df8b3d8f249c0ffd99144451ca3e43a2 GIT binary patch literal 312 zcmZRyU=Uyc0!B7QhRdPKz0Wee;*(~6oYo`LdSOA5$>HnlmFj^F3a5WfU$V-N>)VBI zp>yXHfB)&Igs+nJF9Wn57-YZYmJ&TM^C*)t=m`o&hip_{U6c`3?HgYynZ0jwD?(&1eeLgl}`DmkIDy~ z>D+fG>*-q#pS|wkzX~LDG#!uJypnnHGDmd;<7)PU=gw_ZZ}l)Ys8-HDH$!Ra{h2M* ze8-;c3Q25{d7``b@51dH4NgxEdbRMV^NzlNPbWTGOPQ}|>?)pge(UwCEODwk%BM6e zyT~Q9a3W9Rwww!xC%dP*7oDwDEq}tw$jHD@no_{Pzy=HtGrm`Cu}!K6dpXofl99yn GAz}c9cZyg5 literal 0 HcmV?d00001 diff --git a/contrib/hellos/KD9VVK7H5TJII7OEOMCK9AI5H6EKABCO85OHPPEO72T2K6QGE9IG0LUQTOKOSJSNR9I7HF0CVPJ6C464EM7LMPTVRPU75MP6OIRJQJ0 b/contrib/hellos/KD9VVK7H5TJII7OEOMCK9AI5H6EKABCO85OHPPEO72T2K6QGE9IG0LUQTOKOSJSNR9I7HF0CVPJ6C464EM7LMPTVRPU75MP6OIRJQJ0 new file mode 100644 index 0000000000000000000000000000000000000000..ca800ed6ad987ca28dc44de511dfb4eebd6b5235 GIT binary patch literal 292 zcmV+<0o(ooBmfWq000011_1!)Du3xTPYw0MB^#!bPX@Sb??`X>If8)8b%$uq2Put= z^@SVr{h?ZM?xr~rq2wSlD^d_%VC|B$BQm>d!h>+D)S)Xv);>}J5b{UT@GvVHs+t_^ zNztAW!4PewvZibQ8KXG=-YR*O7WMX*9az=Sa|N2CtIO?0YxmUp++%n-l9&Gzg zedE2FNL^vZeqm(bQ6^#SwhoYsp0+G(mkNAlIyNtQYStR;DH*u=>vv4V3Uw(LkQbB; qOukdsZ*n-@ObDPIXC_Sn0RRAWV{iZf1^@s7HV*2Ba$C?M7YHT{{)0{c literal 0 HcmV?d00001 diff --git a/contrib/hellos/KUPL5G20GSVQQ29GOD7QMTC4IRQ67KGSQ1IOMOIQL7TE78L8UQ2V9SNJQTSIEQ29F7JGPV6VNKG509S048CH31NQH8VIH2T58K8PVM0 b/contrib/hellos/KUPL5G20GSVQQ29GOD7QMTC4IRQ67KGSQ1IOMOIQL7TE78L8UQ2V9SNJQTSIEQ29F7JGPV6VNKG509S048CH31NQH8VIH2T58K8PVM0 new file mode 100644 index 0000000000000000000000000000000000000000..c7b6a5dd2feeda94a0e5d605d9c128c7f8f7268a GIT binary patch literal 312 zcmZRyU=Uyc0!B7QhR-hHK{Ho-eZKsx;?SM)UI+Gj=aUTirheQQ9HzDO)2_#HbBb^H znclB^Z*b}Mh1yb8ljjY+X?p7}zhV?gK4$Ood&$~s^;dGXJpGrqzhUoY(PtrrLg&8( zeBR~~q?KplWo5Ox&-PLb%lWFK?)$!c6V8~n^U%FEm56{lr#ysK&zhFMYWk@QIiZIP zKZUK^r=ajT>0-WXPDzk>gQAnkTPeTf25X}*UIDo}Kjq_-9pcL#rQZ3V7oYLi?!vV* zS@ov*;vL;lJq;_42s^h-Ik-9`a)Rah`9)v9I!#&nIGFn_lk1HIn({yN)RngDf2eZ! zy@YdvBg;IN1=HU=YX0$L`MK|63Wom~85tN#QwkUu*nr_-#`mf%u#M@cK8IRKGLl#r GL<|5sXpNl! literal 0 HcmV?d00001 diff --git a/contrib/hellos/LJR8FV49LJJOCPJFS5894IVT9RU10TENLAM1D61J83BQN629NE1OU56GM54DMIAKS4DAE6UFJBO4BRKDLIOI2OVS6J480QLOGIEPRDG b/contrib/hellos/LJR8FV49LJJOCPJFS5894IVT9RU10TENLAM1D61J83BQN629NE1OU56GM54DMIAKS4DAE6UFJBO4BRKDLIOI2OVS6J480QLOGIEPRDG new file mode 100644 index 0000000000000000000000000000000000000000..1927951ad23f83869fa62ec2de321fde05f5910f GIT binary patch literal 312 zcmZRyU=Uyc0!B7QhDE!al{X2tE$YADnCJJc_u}g*&$vHJ*DpQMV!BeO^36FjzIAVf zCNGGad~K7_-repS{@m9);h_J4i{0UN|2}7loz_RT&kx(fEb=T?W5TaVzx>+Ty^~gN zU-j5>^JhMnbJa6B+f09dj4cf{U;p-L_lsD+52q8;riHz{c(c#;pxyN9J*=ryb}zIj zce%QAvz=tm@uDR=jc+DME5!)51~Ke0YgqofL^UQguV}a6w&RLxmb^X8@Ji;PXx0q_AW;5Qp6FEVvL;;S4NFXCE@mie;64c-j*!UFZO>R89%? z;~9B*d}jgZiIFVy9$82$HW|AiVU?2`;*zFXThU|E-ip6wZd qd$tBf|Dk%U+e4uJMWJ^A0RRAWV{iZf1^@s7HV*2Dgv+vp0|+Mm?}9e~ literal 0 HcmV?d00001 diff --git a/contrib/hellos/R6OVGTG5M5EKRS0MBLGI5VEOG360RCJS2TCUU7OCTGKN5CSBIGCC7C75IU6J1P3F4OQC2D21203VECHCKQ95IBUMO6C46SH5MPAO9J8 b/contrib/hellos/R6OVGTG5M5EKRS0MBLGI5VEOG360RCJS2TCUU7OCTGKN5CSBIGCC7C75IU6J1P3F4OQC2D21203VECHCKQ95IBUMO6C46SH5MPAO9J8 new file mode 100644 index 0000000000000000000000000000000000000000..8703e274510b2da518136011abe8e1daa9dc7e26 GIT binary patch literal 312 zcmZRyU=Uyc0!B7QhG!j@PEAWFy=Waay`gf+?IZJJqAvX3^8Rn(zrT}C@*Al+7q5+b z&GPg4RY2z| zLuvUOiz^yQCjAYMjYL)#a&N!B(JA@ONu4X1$E@YDH&0(#8F$~M@~@=ralT0xo7TO1 z=#qBTwzo&?_0Ihaxo@rBsy&(bV@EI}BLhQeN&y1{8!$Y~_+GU|?$KD4%Ar=0j3ky0 G5d#4EV2yMD literal 0 HcmV?d00001 diff --git a/contrib/hellos/RL7P1AO4M4LOI3JPVER5FJKG6A847K3O86NS4Q07J1721371FO7RB6IFVMNI1NKLFTRCM7O5AGJPQ3UDD8MST8QQHLNOC4GUL6731O0 b/contrib/hellos/RL7P1AO4M4LOI3JPVER5FJKG6A847K3O86NS4Q07J1721371FO7RB6IFVMNI1NKLFTRCM7O5AGJPQ3UDD8MST8QQHLNOC4GUL6731O0 new file mode 100644 index 0000000000000000000000000000000000000000..4341512fe23eff91bd810206f5df1225324f9382 GIT binary patch literal 312 zcmZRyU=Uyc0!B7QhBt~$mUU&khXUet{HD9co-%pqy!^<$>b* zuQ~D9<#@%*aQ$rAxOMXw7X4WLoJ--&VI{v6VSBIiZspKCa$o~vebn(M5APqIUmB?P z_?adnd%DECTh9;fa#bi=`f6AAqvGkW_QxLFztri*f|tqvHCKnQrtg`rd*QoH=dD*9 zVZjmqdTM%>{LNJUsi(Uue`nyLgFfZ2o;Sp1muMY$AeZ2JY}d1wzB$%>|L-k$x2Mf^ zhr|W$*N@JWF}~&8CHFV{XG^g8`py%o6OR0|ow6i1CoIf%XSIZ?e88fsQ_>esoc<>} z-t?ctkIq7YzJyT5{)quRo70qkypT;0W@KbwC`~C~U|<7=hZ*0iHlODCUd|k9CCQj# E02)b>O#lD@ literal 0 HcmV?d00001 diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c index d6e52d4b4..90ab6d5bf 100644 --- a/src/peerinfo/gnunet-service-peerinfo.c +++ b/src/peerinfo/gnunet-service-peerinfo.c @@ -32,12 +32,9 @@ */ #include "platform.h" -#include "gnunet_crypto_lib.h" -#include "gnunet_container_lib.h" -#include "gnunet_disk_lib.h" +#include "gnunet_util_lib.h" #include "gnunet_hello_lib.h" #include "gnunet_protocols.h" -#include "gnunet_service_lib.h" #include "gnunet_statistics_service.h" #include "peerinfo.h" @@ -51,6 +48,7 @@ */ #define DATA_HOST_CLEAN_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 60) + /** * In-memory cache of known hosts. */ @@ -95,6 +93,9 @@ static struct GNUNET_STATISTICS_Handle *stats; /** * Notify all clients in the notify list about the * given host entry changing. + * + * @param he entry of the host for which we generate a notification + * @return generated notification message */ static struct InfoMessage * make_info_message (const struct HostEntry *he) @@ -141,6 +142,8 @@ discard_expired (void *cls, const struct GNUNET_HELLO_Address *address, /** * Get the filename under which we would store the GNUNET_HELLO_Message * for the given host and protocol. + * + * @param id peer for which we need the filename for the HELLO * @return filename of the form DIRECTORY/HOSTID */ static char * @@ -229,6 +232,8 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity) /** * Remove a file that should not be there. LOG * success or failure. + * + * @param fullname name of the file to remove */ static void remove_garbage (const char *fullname) @@ -244,6 +249,15 @@ remove_garbage (const char *fullname) } +/** + * Function that is called on each HELLO file in a particular directory. + * Try to parse the file and add the HELLO to our list. + * + * @param cls pointer to 'unsigned int' to increment for each file, or NULL + * if the file is from a read-only, read-once resource directory + * @param fullname name of the file to parse + * @return GNUNET_OK (continue iteration) + */ static int hosts_directory_scan_callback (void *cls, const char *fullname) { @@ -255,7 +269,8 @@ hosts_directory_scan_callback (void *cls, const char *fullname) return GNUNET_OK; /* ignore non-files */ if (strlen (fullname) < sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) { - remove_garbage (fullname); + if (NULL != matched) + remove_garbage (fullname); return GNUNET_OK; } filename = @@ -263,16 +278,19 @@ hosts_directory_scan_callback (void *cls, const char *fullname) sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1]; if (filename[-1] != DIR_SEPARATOR) { - remove_garbage (fullname); + if (NULL != matched) + remove_garbage (fullname); return GNUNET_OK; } if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (filename, &identity.hashPubKey)) { - remove_garbage (fullname); + if (NULL != matched) + remove_garbage (fullname); return GNUNET_OK; } - (*matched)++; + if (NULL != matched) + (*matched)++; add_host_to_known_hosts (&identity); return GNUNET_OK; } @@ -280,6 +298,9 @@ hosts_directory_scan_callback (void *cls, const char *fullname) /** * Call this method periodically to scan data/hosts for new hosts. + * + * @param cls unused + * @param tc scheduler context, aborted if reason is shutdown */ static void cron_scan_directory_data_hosts (void *cls, @@ -362,7 +383,6 @@ bind_address (const struct GNUNET_PeerIdentity *peer, } - /** * Do transmit info about peer to given host. * @@ -401,6 +421,10 @@ add_to_tc (void *cls, const GNUNET_HashCode * key, void *value) /** * @brief delete expired HELLO entries in data/hosts/ + * + * @param cls pointer to current time (struct GNUNET_TIME_Absolute) + * @param fn filename to test to see if the HELLO expired + * @return GNUNET_OK (continue iteration) */ static int discard_hosts_helper (void *cls, const char *fn) @@ -442,7 +466,11 @@ discard_hosts_helper (void *cls, const char *fn) /** - * Call this method periodically to scan data/hosts for new hosts. + * Call this method periodically to scan data/hosts for ancient + * HELLOs to expire. + * + * @param cls unused + * @param tc scheduler context, aborted if reason is shutdown */ static void cron_clean_data_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) @@ -541,6 +569,9 @@ handle_get_all (void *cls, struct GNUNET_SERVER_Client *client, } +/** + * FIXME. + */ static int do_notify_entry (void *cls, const GNUNET_HashCode * key, void *value) { @@ -576,6 +607,9 @@ handle_notify (void *cls, struct GNUNET_SERVER_Client *client, } +/** + * FIXME. + */ static int free_host_entry (void *cls, const GNUNET_HashCode * key, void *value) { @@ -586,6 +620,7 @@ free_host_entry (void *cls, const GNUNET_HashCode * key, void *value) return GNUNET_YES; } + /** * Clean up our state. Called during shutdown. * @@ -608,7 +643,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** - * Process statistics requests. + * Start up peerinfo service. * * @param cls closure * @param server the initialized server @@ -628,6 +663,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, sizeof (struct GNUNET_MessageHeader)}, {NULL, NULL, 0, 0} }; + char *peerdir; + char *ip; hostmap = GNUNET_CONTAINER_multihashmap_create (1024); stats = GNUNET_STATISTICS_create ("peerinfo", cfg); @@ -644,11 +681,22 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL); GNUNET_SERVER_add_handlers (server, handlers); + ip = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR); + GNUNET_asprintf (&peerdir, + "%shellos", + ip); + GNUNET_free (ip); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + _("Importing HELLOs from `%s'\n"), + peerdir); + GNUNET_DISK_directory_scan (peerdir, + &hosts_directory_scan_callback, NULL); + GNUNET_free (peerdir); } /** - * The main function for the statistics service. + * The main function for the peerinfo service. * * @param argc number of arguments from the command line * @param argv command line arguments -- 2.25.1