dijjer-cvs Mailing List for Dijjer
Brought to you by:
gnovos
Menu
▾
▴
dijjer-cvs
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(69) |
Dec
(314) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(216) |
Feb
(136) |
Mar
(32) |
Apr
(43) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(34) |
Sep
(6) |
Oct
|
Nov
(1) |
Dec
(5) |
| 2006 |
Jan
(1) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(3) |
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: Canadian M. <tmg...@ya...> - 2006-10-19 10:05:12
|
Hello Dijjer-cvs! We want to present you new online p||a?macy store called Canadian Health'N'Care Mall. Here you can find any mediQations that you need. Only high-quality med`s at extremely low prices. There is no need to go to your local drug store and pay lots of money. Just visit http://notifying.blue.escort-finders.com/brunet And buy same medications, save up to 80%! We present totally confidential services for our clients. Instant shipping and friendly support included! -- Best regards, Health'N'Care |
|
From: TCUAG <tel...@t-...> - 2006-10-06 08:39:18
|
We hire for a new project (GUI + videoplayer) Flash-Professionals or Java Professionals. Please provide - fulltime or freelancer - telecommuting or Koblenz - your skills - your salary €/h Regards Petra Bauersachs , CEO --------------------------------------------------------- TC Unterhaltungselektronik AG 56073 Koblenz, Germany Tel: 0049 0172 65 84 139, tel...@t-..., www.telecontrol.de Frankfurt Stock Exchange: 745420 P.S. We still hire --------------------------------------------------------- Python: - Peer to peer software (XP) - Migration to Linux C++ - Active X, Firefox Plugins, GUI Click the following link if you do not want to receive these mails: http://kunden.tivion.de/edit.php?ema...@li...&key=b4899e5c0bb7ef110de3ed6a09596df2 |
|
From: TCUAG <tel...@t-...> - 2006-10-05 08:20:32
|
We hire for a new project (GUI + videoplayer) Flash-Professionals or Java Professionals. Please provide - fulltime or freelancer - telecommuting or Koblenz - your skills - your salary €/h Regards Petra Bauersachs , CEO --------------------------------------------------------- TC Unterhaltungselektronik AG 56073 Koblenz, Germany Tel: 0049 0172 65 84 139, tel...@t-..., www.telecontrol.de Frankfurt Stock Exchange: 745420 P.S. We still hire --------------------------------------------------------- Python: - Peer to peer software (XP) - Migration to Linux C++ - Active X, Firefox Plugins, GUI Click the following link if you do not want to receive these mails: http://kunden.tivion.de/edit.php?ema...@li...&key=b4899e5c0bb7ef110de3ed6a09596df2 |
|
From: TCUAG <tel...@t-...> - 2006-09-28 09:27:04
|
Python: - Peer to peer software (XP) - Migration to Linux C++ - Active X, Firefox Plugins, - GUI Please provide - fulltime or freelancer - telecommuting or Koblenz - your skills - your salary €/h Regards Petra Bauersachs , CEO --------------------------------------------------------- TC Unterhaltungselektronik AG 56073 Koblenz, Germany Tel: 0049 0172 65 84 139, tel...@t-..., www.telecontrol.de Frankfurt Stock Exchange: 745420 Click the following link if you do not want to receive these mails: http://kunden.tivion.de/edit.php?ema...@li...&key=b4899e5c0bb7ef110de3ed6a09596df2 |
|
From: <> - 2006-09-20 08:48:43
|
|
From: Ian C. <sa...@us...> - 2006-02-24 20:02:46
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/updater In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32172/src/dijjer/updater Modified Files: ResourceManager.java Log Message: also update download link Index: ResourceManager.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/updater/ResourceManager.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ResourceManager.java 24 Aug 2005 20:33:54 -0000 1.16 --- ResourceManager.java 24 Feb 2006 20:02:37 -0000 1.17 *************** *** 18,22 **** private static final Map _TCPSockets = Collections.synchronizedMap(new HashMap()); ! private static String _downloadURL = "http://dijjer.org/dijjer.jar"; private static File _classCacheDirectory; private static File _dataDirectory; --- 18,22 ---- private static final Map _TCPSockets = Collections.synchronizedMap(new HashMap()); ! private static String _downloadURL = "http://downloads.dijjer.org/dijjer.jar"; private static File _classCacheDirectory; private static File _dataDirectory; |
|
From: Ian C. <sa...@us...> - 2006-02-24 19:58:50
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30302/src/dijjer Modified Files: Dijjer.java Log Message: up build to 220 for maven support Index: Dijjer.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/Dijjer.java,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** Dijjer.java 17 Dec 2005 05:36:39 -0000 1.114 --- Dijjer.java 24 Feb 2006 19:58:42 -0000 1.115 *************** *** 36,40 **** public static final int PACKET_SIZE = 1024; public static final int PACKETS_IN_BLOCK = 256; ! public static int BUILD = 119; public static int FIRST_GOOD_BUILD = 105; public static final int JOINTTL = 10; --- 36,40 ---- public static final int PACKET_SIZE = 1024; public static final int PACKETS_IN_BLOCK = 256; ! public static int BUILD = 120; public static int FIRST_GOOD_BUILD = 105; public static final int JOINTTL = 10; |
|
From: Turadg A. <tu...@us...> - 2006-02-24 02:58:16
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20392/src/dijjer/util Added Files: Integrity.java Log Message: look for MD5 checksums using the Maven scheme, in URL + ".md5" --- NEW FILE: Integrity.java --- package dijjer.util; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import dijjer.util.logging.Logger; /** * @author turadg */ public class Integrity { /** * Look for the checksum of <tt>$URL</tt> at <tt>$URL.md5</tt>, a la * Maven * * @param url * URL of which to verify the integrity * @return String MD5 checksum found */ public static String checksumByDotMd5(URL url) { try { URL md5sumUrl = new URL(url.toExternalForm() + ".md5"); HttpURLConnection muc = Misc.openHttpUrlConnection(md5sumUrl); muc.connect(); if (muc.getResponseCode() != HttpURLConnection.HTTP_OK) { Logger.info("Got " + muc.getResponseMessage() + " when requesting " + md5sumUrl); return null; } BufferedReader br = new BufferedReader(new InputStreamReader(muc .getInputStream())); String line = br.readLine(); String checksum; int firstSpace = line.indexOf(' '); if (firstSpace > 0) checksum = line.substring(0, firstSpace); else checksum = line; return checksum; } catch (MalformedURLException e) { // TODO Auto-generated catch block e.printStackTrace(); } catch (IOException e) { throw new RuntimeException(e); } return null; } /** * Look for the checksum in a file <tt>MD5SUM</tt> in the same directory * as the given URL * * @param url * URL of which to verify the integrity * @return String MD5 checksum found */ public static String checksumByMD5SUM(URL url) { try { // Check for md5sum file URL md5sumUrl = new URL(url.toString().substring(0, url.toString().lastIndexOf("/")) + "/MD5SUM"); HttpURLConnection muc = Misc.openHttpUrlConnection(md5sumUrl); muc.connect(); if (muc.getResponseCode() != HttpURLConnection.HTTP_OK) { Logger.info("Got " + muc.getResponseMessage() + " when requesting " + md5sumUrl); return null; } String filename = url.toString().substring( url.toString().lastIndexOf("/") + 1, url.toString().length()); BufferedReader br = new BufferedReader(new InputStreamReader(muc .getInputStream())); while (true) { String line = br.readLine(); if (line == null) { break; } if (line.indexOf(" ") == -1) { continue; } String m = line.substring(0, line.indexOf(" ")); String f = line.substring(line.lastIndexOf(" ") + 1, line .length()); if (f.equalsIgnoreCase(filename)) { return m; } } muc.disconnect(); } catch (MalformedURLException e) { e.printStackTrace(); } catch (IOException e) { throw new RuntimeException(e); } return null; } } |
|
From: Turadg A. <tu...@us...> - 2006-02-24 02:58:14
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer/http/handlers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20392/src/dijjer/io/xfer/http/handlers Modified Files: DownloadResponse.java Log Message: look for MD5 checksums using the Maven scheme, in URL + ".md5" Index: DownloadResponse.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer/http/handlers/DownloadResponse.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DownloadResponse.java 4 Apr 2005 11:23:51 -0000 1.7 --- DownloadResponse.java 24 Feb 2006 02:58:11 -0000 1.8 *************** *** 1,10 **** package dijjer.io.xfer.http.handlers; - import java.io.BufferedReader; import java.io.IOException; - import java.io.InputStreamReader; import java.io.OutputStream; - import java.net.HttpURLConnection; - import java.net.MalformedURLException; import java.net.URL; import java.util.LinkedList; --- 1,6 ---- *************** *** 12,17 **** import dijjer.io.store.Store; import dijjer.io.xfer.http.HTTPResponse; import dijjer.util.MD5OutputStream; - import dijjer.util.Misc; import dijjer.util.TruncatingOutputStream; import dijjer.util.logging.Logger; --- 8,13 ---- import dijjer.io.store.Store; import dijjer.io.xfer.http.HTTPResponse; + import dijjer.util.Integrity; import dijjer.util.MD5OutputStream; import dijjer.util.TruncatingOutputStream; import dijjer.util.logging.Logger; *************** *** 20,35 **** public static final String VERSION = "$Id$"; public static final int MAX_RECENT_DOWNLOADS = 5; public static final String RECENT_DOWNLOADS_HEADER = "<tr><td><b>Filename</b></td><td><b>Size (kb)</b></td><td><b>Download Rate(kb/sec)</b></td><td><b>MD5</b> (<font color=\"#00FF00\">Good</font>, <font color=\"#FF0000\">Bad</font>, <font color=\"#000000\">Unverified</font>)</td><td><b>% From cache</b></td></tr>"; public static LinkedList recentDownloads = new LinkedList(); private final long _length; private final byte[] _initialSniffBytes; private final URL _reqUrl; private final String _lastModified; private final long _rangeStart; private final long _rangeEnd; ! public DownloadResponse(int code, String message, String contentType, long length, byte[] initialSniffBytes, ! URL reqUrl, String lastModified, long rangeStart, long rangeEnd) { super(code, message, contentType); _length = length; --- 16,41 ---- public static final String VERSION = "$Id$"; + public static final int MAX_RECENT_DOWNLOADS = 5; + public static final String RECENT_DOWNLOADS_HEADER = "<tr><td><b>Filename</b></td><td><b>Size (kb)</b></td><td><b>Download Rate(kb/sec)</b></td><td><b>MD5</b> (<font color=\"#00FF00\">Good</font>, <font color=\"#FF0000\">Bad</font>, <font color=\"#000000\">Unverified</font>)</td><td><b>% From cache</b></td></tr>"; + public static LinkedList recentDownloads = new LinkedList(); + private final long _length; + private final byte[] _initialSniffBytes; + private final URL _reqUrl; + private final String _lastModified; + private final long _rangeStart; + private final long _rangeEnd; ! public DownloadResponse(int code, String message, String contentType, ! long length, byte[] initialSniffBytes, URL reqUrl, ! String lastModified, long rangeStart, long rangeEnd) { super(code, message, contentType); _length = length; *************** *** 50,62 **** int startBlock = (int) (_rangeStart / Store.DATA_BLOCK_SIZE); int endBlock = (int) (_rangeEnd / Store.DATA_BLOCK_SIZE); ! OutputStream tos = new TruncatingOutputStream(out, DownloadHandler.INITIAL_SNIFF_BYTES ! + (_rangeStart % Store.DATA_BLOCK_SIZE), (_rangeEnd - _rangeStart) + 1 ! - DownloadHandler.INITIAL_SNIFF_BYTES); ! Download dl = new Download(_reqUrl, _length, _lastModified, startBlock, endBlock, tos); long startTime = System.currentTimeMillis(); dl.start(); long totalTime = System.currentTimeMillis() - startTime; String actualMD5 = out.getMD5Sum(); ! String correctMD5 = downloadMD5(); synchronized (recentDownloads) { while (recentDownloads.size() >= MAX_RECENT_DOWNLOADS) { --- 56,71 ---- int startBlock = (int) (_rangeStart / Store.DATA_BLOCK_SIZE); int endBlock = (int) (_rangeEnd / Store.DATA_BLOCK_SIZE); ! OutputStream tos = new TruncatingOutputStream(out, ! DownloadHandler.INITIAL_SNIFF_BYTES ! + (_rangeStart % Store.DATA_BLOCK_SIZE), ! (_rangeEnd - _rangeStart) + 1 ! - DownloadHandler.INITIAL_SNIFF_BYTES); ! Download dl = new Download(_reqUrl, _length, _lastModified, startBlock, ! endBlock, tos); long startTime = System.currentTimeMillis(); dl.start(); long totalTime = System.currentTimeMillis() - startTime; String actualMD5 = out.getMD5Sum(); ! String correctMD5 = downloadMd5(); synchronized (recentDownloads) { while (recentDownloads.size() >= MAX_RECENT_DOWNLOADS) { *************** *** 66,73 **** rd.append("<tr>"); rd.append("<td>" ! + _reqUrl.toString() ! .substring(_reqUrl.toString().lastIndexOf("/") + 1, _reqUrl.toString().length()) + "</td>"); rd.append("<td>" + (_length / 1024) + "</td>"); ! rd.append("<td>" + ((int)((1000f * (float)dl.getDownloaded()) / (1024f * (float)totalTime))) + "</td>"); String md5Colour; if (correctMD5 == null) { --- 75,86 ---- rd.append("<tr>"); rd.append("<td>" ! + _reqUrl.toString().substring( ! _reqUrl.toString().lastIndexOf("/") + 1, ! _reqUrl.toString().length()) + "</td>"); rd.append("<td>" + (_length / 1024) + "</td>"); ! rd ! .append("<td>" ! + ((int) ((1000f * (float) dl.getDownloaded()) / (1024f * (float) totalTime))) ! + "</td>"); String md5Colour; if (correctMD5 == null) { *************** *** 78,86 **** } else { md5Colour = "#FF0000"; ! Logger.warning("File "+_reqUrl+" failed MD5Sum check!"); } } ! rd.append("<td><font color=\""+md5Colour+"\">"+actualMD5+"</font></td>"); ! rd.append("<td>"+Math.min(100, (dl.getBytesFromCache() * 100) / dl.getDownloaded())+"</td>"); rd.append("</tr>"); recentDownloads.addFirst(rd.toString()); --- 91,102 ---- } else { md5Colour = "#FF0000"; ! Logger.warning("File " + _reqUrl + " failed MD5Sum check!"); } } ! rd.append("<td><font color=\"" + md5Colour + "\">" + actualMD5 ! + "</font></td>"); ! rd.append("<td>" ! + Math.min(100, (dl.getBytesFromCache() * 100) ! / dl.getDownloaded()) + "</td>"); rd.append("</tr>"); recentDownloads.addFirst(rd.toString()); *************** *** 88,125 **** } ! private String downloadMD5() { ! try { ! // Check for md5sum file ! URL md5sumUrl = new URL(_reqUrl.toString().substring(0, _reqUrl.toString().lastIndexOf("/")) + "/MD5SUM"); ! HttpURLConnection muc = Misc.openHttpUrlConnection(md5sumUrl); ! muc.connect(); ! if (muc.getResponseCode() != HttpURLConnection.HTTP_OK) { ! Logger.info("Got " + muc.getResponseMessage() + " when requesting " + md5sumUrl); ! return null; ! } ! String filename = _reqUrl.toString().substring(_reqUrl.toString().lastIndexOf("/") + 1, ! _reqUrl.toString().length()); ! BufferedReader br = new BufferedReader(new InputStreamReader(muc.getInputStream())); ! while (true) { ! String line = br.readLine(); ! if (line == null) { ! break; ! } ! if (line.indexOf(" ") == -1) { ! continue; ! } ! String m = line.substring(0, line.indexOf(" ")); ! String f = line.substring(line.lastIndexOf(" ") + 1, line.length()); ! if (f.equalsIgnoreCase(filename)) { ! return m; ! } ! } ! muc.disconnect(); ! } catch (MalformedURLException e) { ! e.printStackTrace(); ! } catch (IOException e) { ! throw new RuntimeException(e); ! } ! return null; } } --- 104,112 ---- } ! private String downloadMd5() { ! String sum = Integrity.checksumByMD5SUM(_reqUrl); ! if (sum == null) ! sum = Integrity.checksumByDotMd5(_reqUrl); ! return sum; } } |
|
From: AVS S. <to...@ya...> - 2006-01-25 14:48:17
|
Hello Dijjer-cvs,
At this time we can offer a small update at our system - LS-L0 LITA and LITTLE CUTIES!
Studio and our little stars are proud to present their new project. You can
now compare this one with our other sites, judge the level of professionalism
and exposure of subject, with have never been so high! Starign from over
4,000 HQ pics, the project features sets made in the studio, as well as on
the side of nature.
http://malfunctions.bigsitedeal.com/7/?skyrockets
Our great and unique offer: for each subscribtion You get access to another
three sites from our portal for 31 days... without any additional payments!
Simply subscribe, select and use!
MSGID: VPtuZYBm770K8PskeetTvjCel8QdtlgE1
|
|
From: Chris C. <vo...@us...> - 2005-12-26 19:30:53
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/comm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24718/io/comm Modified Files: RoutingTable.java Log Message: Doubled the ping rate trying to get better delays through more accurate round trip time measurements. Index: RoutingTable.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/comm/RoutingTable.java,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** RoutingTable.java 25 Aug 2005 00:53:51 -0000 1.49 --- RoutingTable.java 26 Dec 2005 19:30:44 -0000 1.50 *************** *** 46,50 **** public static final String VERSION = "$Id$"; public static final int UCPINGRATE = 5000; ! public static final int PINGRATE = 60000; private Peer _peer; private final Set _seedNodes; --- 46,50 ---- public static final String VERSION = "$Id$"; public static final int UCPINGRATE = 5000; ! public static final int PINGRATE = 30000; private Peer _peer; private final Set _seedNodes; |
|
From: Chris C. <vo...@us...> - 2005-12-26 11:39:06
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10136 Modified Files: BlockTransmitter.java Log Message: Simplified flow control a little more; set it to rebegin the loop whenever it sleeps just in case new information comes in about having to delay. Index: BlockTransmitter.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer/BlockTransmitter.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** BlockTransmitter.java 24 Dec 2005 14:02:32 -0000 1.20 --- BlockTransmitter.java 26 Dec 2005 11:38:57 -0000 1.21 *************** *** 38,42 **** public class BlockTransmitter { - static long _nextPacketSendTime; public static final int WAIT_AFTER_ALL_SENT = 10000; UdpSocketManager _usm; --- 38,41 ---- *************** *** 86,105 **** }); sendloop: while (!isFinished()) { synchronized(this) { ! // Going to synchronize on this for the entire loop. This way we don't have to check on ! // isFinished so much since it will only change between loops and during the wait calls ! if (_nextPacketSendTime < System.currentTimeMillis()) { ! _nextPacketSendTime = System.currentTimeMillis(); ! } ! _nextPacketSendTime += _throttle.getDelay(); // Wait until we are allowed to send a packet according to throttle long lTime = System.currentTimeMillis(); ! long lTimeOut = _nextPacketSendTime - System.currentTimeMillis(); ! if (lTimeOut > 50) { try { ! this.wait(lTimeOut); } catch (InterruptedException e) { if (isFinished()) break sendloop; } ! } lTime = System.currentTimeMillis() - lTime; --- 85,105 ---- }); sendloop: while (!isFinished()) { synchronized(this) { ! // Synchronize on this for the entire loop. This way we don't have to check on ! // isFinished so much since it will only change between loops and during the wait calls. ! // Also, if we have to wait at all we start through the loop again to see if the delay ! // has been updated with a missing packet message. ! // Wait until we are allowed to send a packet according to throttle long lTime = System.currentTimeMillis(); ! long currentDelay = lTime - _lastPacketSendTime; ! long remainingDelay = _throttle.getDelay() - currentDelay; ! if (remainingDelay > 50) { ! System.out.println("CCC timeout:"+remainingDelay); try { ! this.wait(remainingDelay); } catch (InterruptedException e) { if (isFinished()) break sendloop; } ! continue sendloop; } lTime = System.currentTimeMillis() - lTime; *************** *** 111,129 **** int nextToSend = -1; lTime = System.currentTimeMillis(); ! do { ! for (int x = 0; x < Dijjer.PACKETS_IN_BLOCK; x++) { ! if (_prb.isReceived(x) && !_sent.bitAt(x)) { ! nextToSend = x; ! break; ! } } ! if (nextToSend == -1) { ! try { ! this.wait(); ! } catch (InterruptedException e) { ! if (isFinished()) break sendloop; ! } } ! } while (nextToSend == -1); lTime = System.currentTimeMillis() - lTime; if (lTime > 3000) { --- 111,128 ---- int nextToSend = -1; lTime = System.currentTimeMillis(); ! for (int x = 0; x < Dijjer.PACKETS_IN_BLOCK; x++) { ! if (_prb.isReceived(x) && !_sent.bitAt(x)) { ! nextToSend = x; ! break; } ! } ! if (nextToSend == -1) { ! try { ! this.wait(); ! } catch (InterruptedException e) { ! if (isFinished()) break sendloop; } ! continue sendloop; ! } lTime = System.currentTimeMillis() - lTime; if (lTime > 3000) { |
|
From: Chris C. <vo...@us...> - 2005-12-24 14:02:43
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31816 Modified Files: BlockTransmitter.java Log Message: Moved synchronization to allow for fewer checks of isFinished() and avoid what may be very slight chances for race conditions. Index: BlockTransmitter.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer/BlockTransmitter.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** BlockTransmitter.java 4 Aug 2005 20:46:03 -0000 1.19 --- BlockTransmitter.java 24 Dec 2005 14:02:32 -0000 1.20 *************** *** 85,89 **** } }); ! while (!isFinished()) { if (_nextPacketSendTime < System.currentTimeMillis()) { _nextPacketSendTime = System.currentTimeMillis(); --- 85,91 ---- } }); ! sendloop: while (!isFinished()) { synchronized(this) { ! // Going to synchronize on this for the entire loop. This way we don't have to check on ! // isFinished so much since it will only change between loops and during the wait calls if (_nextPacketSendTime < System.currentTimeMillis()) { _nextPacketSendTime = System.currentTimeMillis(); *************** *** 94,103 **** long lTimeOut = _nextPacketSendTime - System.currentTimeMillis(); if (lTimeOut > 50) { ! synchronized (this) { ! try { ! this.wait(lTimeOut); ! } catch (InterruptedException e) { ! } } } lTime = System.currentTimeMillis() - lTime; --- 96,105 ---- long lTimeOut = _nextPacketSendTime - System.currentTimeMillis(); if (lTimeOut > 50) { ! try { ! this.wait(lTimeOut); ! } catch (InterruptedException e) { ! if (isFinished()) break sendloop; } + } lTime = System.currentTimeMillis() - lTime; *************** *** 116,139 **** } } ! if ((nextToSend == -1) && !isFinished()) { ! synchronized (this) { ! try { ! this.wait(); ! } catch (InterruptedException e) { ! } } } ! } while ((nextToSend == -1) && !isFinished()); ! if ((nextToSend != -1) && !isFinished()) { ! lTime = System.currentTimeMillis() - lTime; ! if (lTime > 3000) { ! Logger.warning("Waited " + lTime + "ms due to suitable packet unavailability (uid: " + _uid + ")"); ! } ! _lastPacketSendTime = System.currentTimeMillis(); ! _throttle.notifyOfPacketSent(); ! _usm.send(_dest, DMT.createPacketTransmit(_uid, nextToSend, _sent, _prb.getPacket(nextToSend))); ! _sent.setBit(nextToSend, true); } ! } } --- 118,138 ---- } } ! if (nextToSend == -1) { ! try { ! this.wait(); ! } catch (InterruptedException e) { ! if (isFinished()) break sendloop; } } ! } while (nextToSend == -1); ! lTime = System.currentTimeMillis() - lTime; ! if (lTime > 3000) { ! Logger.warning("Waited " + lTime + "ms due to suitable packet unavailability (uid: " + _uid + ")"); } ! _lastPacketSendTime = System.currentTimeMillis(); ! _throttle.notifyOfPacketSent(); ! _usm.send(_dest, DMT.createPacketTransmit(_uid, nextToSend, _sent, _prb.getPacket(nextToSend))); ! _sent.setBit(nextToSend, true); ! }} //end synchronized and sendloop } |
|
From: Chris C. <vo...@us...> - 2005-12-17 05:36:49
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24504/src/dijjer Modified Files: Dijjer.java Log Message: Got the initpeer argument right this time... Index: Dijjer.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/Dijjer.java,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** Dijjer.java 15 Dec 2005 11:36:40 -0000 1.113 --- Dijjer.java 17 Dec 2005 05:36:39 -0000 1.114 *************** *** 47,50 **** --- 47,51 ---- // Preferences protected HashSet _seedNodes = new HashSet(); + protected LinkedList _initPeers = new LinkedList(); private static final int DEFAULT_THREAD_COUNT = 6; private int _externalListenPort = DEFAULT_EXTERNAL_PORT; *************** *** 107,110 **** --- 108,116 ---- public void connectToNetwork() throws Exception { + for (Iterator i = _initPeers.iterator(); i.hasNext();) { + Peer peer = (Peer) i.next(); + Logger.info("Adding peer " + peer); + RoutingTable.getRoutingTable().addPeer(peer); + } if (_seedNodes.size() == 0) { // Don't seed if we are a seed node *************** *** 213,217 **** public void addPeer(Peer peer) { ! RoutingTable.getRoutingTable().addPeer(peer); } --- 219,223 ---- public void addPeer(Peer peer) { ! _initPeers.add(peer); } |
|
From: Chris C. <vo...@us...> - 2005-12-15 11:36:50
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16091/src/dijjer Modified Files: Dijjer.java Main.java Log Message: Added an initial peers feature mainly for debugging. Index: Dijjer.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/Dijjer.java,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** Dijjer.java 25 Aug 2005 23:40:24 -0000 1.112 --- Dijjer.java 15 Dec 2005 11:36:40 -0000 1.113 *************** *** 211,214 **** --- 211,218 ---- _seedNodes.add(peer); } + + public void addPeer(Peer peer) { + RoutingTable.getRoutingTable().addPeer(peer); + } public void setDataStoreSize(int dataStoreSize) { Index: Main.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/Main.java,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** Main.java 23 Aug 2005 19:09:19 -0000 1.83 --- Main.java 15 Dec 2005 11:36:40 -0000 1.84 *************** *** 159,163 **** } }); ! addArgument("seedNode", "The address of an initial peer through which Dijjer can connect to the network", new ArgumentAction() { public void performAction(String arg) throws Exception { --- 159,163 ---- } }); ! addArgument("seedNode", "The addresses of an seednode through which Dijjer can connect to the network", new ArgumentAction() { public void performAction(String arg) throws Exception { *************** *** 200,203 **** --- 200,234 ---- } }); + addArgument("initPeer", "The addresses of some known peers, mainly for testing", + new ArgumentAction() { + public void performAction(String arg) throws Exception { + int cp = 0; + int sn = arg.indexOf(','); + while (sn != -1) { + // blank list items (sn == cp) get skipped (ie. host:port,,host:port) + if ( sn > cp ) { + String sarg = arg.substring(cp, sn); + int p = sarg.indexOf(':'); + if (p != -1) { + String addr = sarg.substring(0, p); + int port = Integer.parseInt(sarg.substring(p + 1, sarg.length())); + Dijjer.getDijjer().addPeer(new Peer(InetAddress.getByName(addr), port)); + } else { + Logger.warning(sarg + " initPeer is not in host:port format"); + } + } + cp = sn + 1; + sn = arg.indexOf(',', cp); + } + int p = arg.indexOf(':', cp); + if (p != -1) { + String addr = arg.substring(cp, p); + int port = Integer.parseInt(arg.substring(p + 1, arg.length())); + Dijjer.getDijjer().addPeer(new Peer(InetAddress.getByName(addr), port)); + } else { + Logger.warning(arg.substring(cp) + " initPeer is not in host:port format"); + } + } + }); addUnmatchedKeyArgument("help", "This help menu", new ArgumentAction() { public void performAction(String arg) throws Exception { |
|
From: Support <mi...@wa...> - 2005-11-26 16:11:53
|
Hello Dijjer-cvs,
At this time we can offer a small update at our system - BD-MAG #10!
BD's got the right idea! How does 50 mpeg variety of young beautiful
models doing it all from dancing to possing without tons of crap in
between sound to you? Too good to be true, not here. You've got a great
site. Why don't the other web sites?
http://vellum.avsforall.com/8/?dialing
Our great and unique offer: for each subscribtion You get access to another
three sites from our portal for 31 days... without any additional payments!
Simply subscribe, select and use!
MSGID: gzyOC7XmrDhA1fpassedHZr5QJAoB38vaC
|
|
From: Chris <ch...@us...> - 2005-09-14 06:04:51
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15416/io/xfer Modified Files: BlockReceiver.java Log Message: Reduced the frequency of checks for missing packets and increase the time between re-requesting missing packets. Multiple missing packet notifications were probably leading to a lot of the unmatched packetTransmit messages. Index: BlockReceiver.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer/BlockReceiver.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** BlockReceiver.java 25 Aug 2005 23:40:24 -0000 1.16 --- BlockReceiver.java 14 Sep 2005 06:04:44 -0000 1.17 *************** *** 83,86 **** --- 83,90 ---- // Remove it from rrmp if its in there _recentlyReportedMissingPackets.remove(new Integer(packetNo)); + // Skip checks except for 1 out of 16 packets until we get to the end + if ((_prb.numReceived() < (_prb.getNumPackets() - 16)) + && (packetNo % 16 != 0)) + continue; // Check that we have what the sender thinks we have LinkedList missing = new LinkedList(); *************** *** 94,98 **** // based on the number of other packets we are already waiting for long resendWait = System.currentTimeMillis() ! + (MAX_ROUND_TRIP_TIME + (_recentlyReportedMissingPackets.size() * MAX_SEND_INTERVAL)); _recentlyReportedMissingPackets.put(new Integer(x), (new Long(resendWait))); missing.add(new Integer(x)); --- 98,102 ---- // based on the number of other packets we are already waiting for long resendWait = System.currentTimeMillis() ! + (10*MAX_ROUND_TRIP_TIME + (_recentlyReportedMissingPackets.size() * MAX_SEND_INTERVAL)); _recentlyReportedMissingPackets.put(new Integer(x), (new Long(resendWait))); missing.add(new Integer(x)); |
|
From: Chris <ch...@us...> - 2005-09-14 06:02:24
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/comm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15150/io/comm Modified Files: UdpSocketManager.java Log Message: Add another filter check to eliminate some of these unmatched packetTransmit messages. Index: UdpSocketManager.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/comm/UdpSocketManager.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** UdpSocketManager.java 25 Aug 2005 23:40:24 -0000 1.41 --- UdpSocketManager.java 14 Sep 2005 06:02:16 -0000 1.42 *************** *** 91,94 **** --- 91,95 ---- } } + if (!matched) matched = MessageFilter.checkFilters(m); // Keep the last few _unclaimed messages around in case the intended receiver isn't receiving yet if (!matched) { |
|
From: Chris <ch...@us...> - 2005-09-14 06:01:22
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/comm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14967/io/comm Modified Files: Dispatcher.java Log Message: Don't pick the same peer all the time if we didn't get a response. Index: Dispatcher.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/comm/Dispatcher.java,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Dispatcher.java 12 Apr 2005 13:04:18 -0000 1.59 --- Dispatcher.java 14 Sep 2005 06:01:14 -0000 1.60 *************** *** 225,229 **** return true; } ! Peer best; HashSet exclude = new HashSet(); // We don't want to bother the seed with // requests for data --- 225,230 ---- return true; } ! Peer best = null; ! Peer last = null; HashSet exclude = new HashSet(); // We don't want to bother the seed with // requests for data *************** *** 269,273 **** --- 270,276 ---- // No response in 4 seconds, flag this guy to be recontacted and continue the while loop to find another // or possibly just download it ourselves + if (best == last) exclude.add(best); _rt.recontactPeer(best); + exclude.add(best); continue; } |
|
From: Chris <ch...@us...> - 2005-09-13 18:46:01
|
Update of /cvsroot/dijjer/website/get In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3165 Modified Files: index.php Log Message: Changes to make this work better when we detect dijjer through the javascript routines. Index: index.php =================================================================== RCS file: /cvsroot/dijjer/website/get/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 15 Feb 2005 16:12:10 -0000 1.1.1.1 --- index.php 13 Sep 2005 18:45:45 -0000 1.2 *************** *** 1,3 **** - <?php //Redirects user to Dijjerized version of URL --- 1,2 ---- *************** *** 27,32 **** if (isset($_GET['unsetauto'])) { setcookie("auto", "", time()-3600); ! } else if ((isset($_COOKIE['auto'])) || (isset($_GET['setauto']))) { ! setcookie("auto", "yes", time()+60*60*24*7); if (isset($_GET['url'])) { dijjer_goto($_GET['url']); --- 26,33 ---- if (isset($_GET['unsetauto'])) { setcookie("auto", "", time()-3600); ! } else if ((isset($_COOKIE['auto'])) || (isset($_GET['setauto'])) || (isset($_GET['found']))) { ! if(!isset($_GET['found'])) { ! setcookie("auto", "yes", time()+60*60*24*7); ! } if (isset($_GET['url'])) { dijjer_goto($_GET['url']); *************** *** 34,38 **** } ! $f = fopen("access.log", "a"); $remaddr = $_SERVER["REMOTE_ADDR"]; $ips = explode(".", $remaddr); --- 35,40 ---- } ! ! if ($f = @fopen("access.log", "a")) { $remaddr = $_SERVER["REMOTE_ADDR"]; $ips = explode(".", $remaddr); *************** *** 45,48 **** --- 47,51 ---- $_SERVER["HTTP_REFERER"] . "\n"); fclose($f); + } require_once("browser.php"); *************** *** 162,166 **** /* Layout Styles */ ! #wrapper{ width: 700px; border: 1px solid gray; --- 165,169 ---- /* Layout Styles */ ! #wrapper, #haveit { width: 700px; border: 1px solid gray; *************** *** 240,255 **** if (!document.getElementById) return false; var infoObj = document.getElementById("info"); ! if ("info") { infoObj.style.display = "block"; } } --></script> ! <script type="text/javascript" src="themes/pushbutton/dijjer.js"> </script> </head> ! <body <?php if (isset($_GET['url']) && (substr($_GET['url'],0,4)=='http')) { ?> onLoad="dijjer('<?=$_GET['url']?>');" <?php } ?> ! > <div id="wrapper" class="get"> --- 243,292 ---- if (!document.getElementById) return false; var infoObj = document.getElementById("info"); ! if (info) { infoObj.style.display = "block"; } } --></script> ! <script type="text/javascript" src="dijjer.js"> </script> </head> ! <body> ! <img src="http://127.0.0.1:9115/graph.gif" id="DijjerDetector" style="margin-left:-1000px" <?php if (isset($_GET['url']) && (substr($_GET['url'],0,4)=='http')) { ?> onLoad="dijjer('<?=$_GET['url']?>');" <?php } ?> ! /> ! <div id="haveit" class="hide"> ! <h1 style="margin:0; padding: 10px; border-bottom: 1px solid #bbb;">Thank you!</h1> ! <p>Your download is using <a href="http://dijjer.org">Dijjer</a> to save bandwidth. ! </p> ! <p>Dijjer has no adware or spyware. It's free software, made by a community of volunteers. ! <a href="javascript:display('info');" title="Click for more information.">More info</a> ! ! </p> ! ! <p id="info"> ! Dijjer is a peer-to-peer web cache that runs on your computer. When you use Dijjer, parts of the file you're looking ! for come from the website you're at, but most of the file comes from other users who also want the file. In turn, your ! computer will share pieces of files with other users too. For more information about how Dijjer works check out the <a ! href="http://dijjer.org/wiki/FrequentlyAskedQuestions">Dijjer FAQ</a> or for a really technical description of how Dijjer works check out the <a ! href="http://dijjer.org/wiki/Development/">developers page</a>. <br /><br />If you stop using Dijjer regularly, it's easy to ! uninstall. ! </p> ! ! <p> ! <?php ! if (isset($_GET['url'])) { ! if (substr($_GET['url'],0,4)=='http') { ! ?> ! If your download didn't start, <a href="http://127.0.0.1:9115/<?=$_GET['url']?>">click here to download <b class="redtext"><?=htmlspecialchars($filename)?></b></a><?php } else { ?> ! If your download didn't start, <a href="<?=substr($_GET['url'],8)?>">click here to download <b class="redtext"><?=htmlspecialchars($filename)?></b></a></li> ! <?php } ! } else { ?> ! Click <a href="http://127.0.0.1:9115/">here</a> to see the Dijjer status page, or click <a href="http://dijjer.org/">here</a> to learn more about Dijjer.</li> ! <?php } ?> ! ! </p> ! </div> ! <div id="wrapper" class="get"> *************** *** 277,281 **** <p id="info"> ! Dijjer is a peer-to-peer web cache that runs on your computer. When you use Dijjer, parts of the file you're looking for come from the website you're at, but most of the file comes from other users who also want the file. In turn, your computer will share pieces of files with other users too. For more information about how Dijjer works check out the <a href="http://dijjer.org/faq">Dijjer FAQ</a> or for a really technical description of how Dijjer works check out the <a href="http://dijjer.org/development/">developers page</a>. <br /><br />If you stop using Dijjer regularly, it's easy to uninstall. </p> --- 314,323 ---- <p id="info"> ! Dijjer is a peer-to-peer web cache that runs on your computer. When you use Dijjer, parts of the file you're looking ! for come from the website you're at, but most of the file comes from other users who also want the file. In turn, your ! computer will share pieces of files with other users too. For more information about how Dijjer works check out the <a ! href="http://dijjer.org/wiki/FrequentlyAskedQuestions">Dijjer FAQ</a> or for a really technical description of how Dijjer works check out the <a ! href="http://dijjer.org/wiki/Development/">developers page</a>. <br /><br />If you stop using Dijjer regularly, it's easy to ! uninstall. </p> |
|
From: Chris <ch...@us...> - 2005-09-13 18:44:55
|
Update of /cvsroot/dijjer/website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2872 Modified Files: dijjer.js Log Message: Changed so that we can detect existing dijjer installations from http://dijjer.org/get/. Index: dijjer.js =================================================================== RCS file: /cvsroot/dijjer/website/dijjer.js,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dijjer.js 15 Feb 2005 16:09:21 -0000 1.1.1.1 --- dijjer.js 13 Sep 2005 18:44:41 -0000 1.2 *************** *** 27,39 **** } ! function dijjer(e) { ! var url = e.href; ! var i = url.indexOf("get/"); ! if (i != -1) { ! checkDijjer(url); ! return false; ! } else { ! return true; ! } } function hasDijjer() { --- 27,41 ---- } ! function dijjer(url) { ! if(hasDijjer()) { ! if(document.getElementById) { ! var get = document.getElementById('wrapper'); ! get.style.display = "none"; ! var got = document.getElementById('haveit'); ! got.style.display = "block"; ! } ! location.href = location.href + '&found=true'; ! } ! return true; } function hasDijjer() { *************** *** 43,47 **** } var dijjerImage = document.getElementById('DijjerDetector'); ! return ((typeof dijjerImage.width != "undefined") && (dijjerImage.width == dijjerGifWidth)); } --- 45,49 ---- } var dijjerImage = document.getElementById('DijjerDetector'); ! return (dijjerImage && (typeof dijjerImage.width != "undefined") && (dijjerImage.width == dijjerGifWidth)); } |
|
From: Ian C. <sa...@us...> - 2005-09-09 10:35:49
|
Update of /cvsroot/dijjer/website In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8492/dijjer_website Modified Files: header.php sidebar.php Log Message: update news, clean up old items Index: header.php =================================================================== RCS file: /cvsroot/dijjer/website/header.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** header.php 21 Feb 2005 12:08:41 -0000 1.3 --- header.php 9 Sep 2005 10:35:37 -0000 1.4 *************** *** 32,38 **** <a href="http://www.dijjer.org">Home</a> <a href="faq.php">FAQ</a> ! <a href="development.php">Development</a> <a href="people.php">People</a> <a href="news.php">News</a> <a href="taxonomy/term/1/10/feed"><img src="i/rss_button.gif" alt="RSS" /></a> </div> --- 32,39 ---- <a href="http://www.dijjer.org">Home</a> <a href="faq.php">FAQ</a> ! <a href="wiki/Development">Development</a> <a href="people.php">People</a> <a href="news.php">News</a> + <a href="wiki/">Wiki</a> <a href="taxonomy/term/1/10/feed"><img src="i/rss_button.gif" alt="RSS" /></a> </div> *************** *** 44,46 **** <hr class="hrclear" /> ! <!-- End Banner --> \ No newline at end of file --- 45,47 ---- <hr class="hrclear" /> ! <!-- End Banner --> Index: sidebar.php =================================================================== RCS file: /cvsroot/dijjer/website/sidebar.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sidebar.php 21 Feb 2005 12:34:06 -0000 1.4 --- sidebar.php 9 Sep 2005 10:35:37 -0000 1.5 *************** *** 42,52 **** </div> <div class="a_video"> - <img src="http://skateboardingbulldog.com/tyskate1.jpg" width="90" /> - <a href="http://www.dijjer.org/get/http://www.skateboardingbulldog.com/sktrb6.58mb.mov">Skateboarding Bulldog</a> - <br /> - <span class="submit">This dog skateboards. It's truly amazing.</span> - <div class="clear"></div> - </div> - <div class="a_video"> <img src="http://www.law.duke.edu/images/CSPD/contest/finalists/stealing.jpg" width="90" /> <a href="http://www.dijjer.org/get/http://www.law.duke.edu/cspd/contest/finalists/entries/stealinghome.mov">Stealing Home</a> --- 42,45 ---- |
|
From: Chris <ch...@us...> - 2005-08-26 02:20:19
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/comm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9975/src/dijjer/io/comm Modified Files: MulticastSocketManager.java Log Message: Don't answer multicast queries that we sent. Index: MulticastSocketManager.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/comm/MulticastSocketManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MulticastSocketManager.java 24 Aug 2005 02:55:48 -0000 1.1 --- MulticastSocketManager.java 26 Aug 2005 02:20:11 -0000 1.2 *************** *** 64,68 **** return; } ! if (m == null) { return; } --- 64,73 ---- return; } ! // No message, or one we sent to the multicast group ! if ((m == null) ! || (m.getSpec().equals(DMT.whoAreYou) ! && (m.getSource().getPort() == ResourceManager.mcastPort) ! && m.getSource().getAddress().equals( ! RoutingTable.getRoutingTable().getPeer().getAddress()))) { return; } |
|
From: Chris <ch...@us...> - 2005-08-25 23:40:32
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11833/src/dijjer/io/xfer Modified Files: BlockReceiver.java Log Message: Changed receive() so that filters are created earlier. Trying to track down why there are so many unmatched packetTransmit messages. Index: BlockReceiver.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/xfer/BlockReceiver.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BlockReceiver.java 25 Aug 2005 00:24:18 -0000 1.15 --- BlockReceiver.java 25 Aug 2005 23:40:24 -0000 1.16 *************** *** 62,70 **** public byte[] receive() throws RetrievalException { int consecutiveMissingPacketReports = 0; while (!_prb.allReceived()) { ! Message m1 = _usm.waitFor((MessageFilter.create( ! _prb.numReceived() == 0 ? INITIAL_RECEIPT_TIMEOUT : RECEIPT_TIMEOUT, DMT.packetTransmit) ! .addType(DMT.allSent).addType(DMT.sendAborted)) ! .setField(DMT.UID, _uid)); if ((m1 != null) && (m1.getSpec().equals(DMT.packetTransmit))) { consecutiveMissingPacketReports = 0; --- 62,77 ---- public byte[] receive() throws RetrievalException { int consecutiveMissingPacketReports = 0; + MessageFilter f = MessageFilter.create(INITIAL_RECEIPT_TIMEOUT, DMT.packetTransmit) + .setField(DMT.UID, _uid) + .addType(DMT.allSent) + .addType(DMT.sendAborted); while (!_prb.allReceived()) { ! Message m1 = _usm.waitFor(f); ! // Get ready for the next packet ! f = MessageFilter.create(RECEIPT_TIMEOUT, DMT.packetTransmit) ! .setField(DMT.UID, _uid) ! .addType(DMT.allSent) ! .addType(DMT.sendAborted); ! // The faster we finish the rest of this loop the better! if ((m1 != null) && (m1.getSpec().equals(DMT.packetTransmit))) { consecutiveMissingPacketReports = 0; *************** *** 84,90 **** Long resendTime = (Long) _recentlyReportedMissingPackets.get(new Integer(x)); if ((resendTime == null) || (System.currentTimeMillis() > resendTime.longValue())) { ! // Make a note of the earliest time we should resend this, based on the number of other ! // packets we ! // are already waiting for long resendWait = System.currentTimeMillis() + (MAX_ROUND_TRIP_TIME + (_recentlyReportedMissingPackets.size() * MAX_SEND_INTERVAL)); --- 91,96 ---- Long resendTime = (Long) _recentlyReportedMissingPackets.get(new Integer(x)); if ((resendTime == null) || (System.currentTimeMillis() > resendTime.longValue())) { ! // Make a note of the earliest time we should resend this, ! // based on the number of other packets we are already waiting for long resendWait = System.currentTimeMillis() + (MAX_ROUND_TRIP_TIME + (_recentlyReportedMissingPackets.size() * MAX_SEND_INTERVAL)); *************** *** 102,105 **** --- 108,112 ---- } } + continue; } if ((m1 != null) && m1.getSpec().equals(DMT.sendAborted)) { |
|
From: Chris <ch...@us...> - 2005-08-25 23:40:32
|
Update of /cvsroot/dijjer/Dijjer/src/dijjer/io/comm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11833/src/dijjer/io/comm Modified Files: UdpSocketManager.java Log Message: Changed receive() so that filters are created earlier. Trying to track down why there are so many unmatched packetTransmit messages. Index: UdpSocketManager.java =================================================================== RCS file: /cvsroot/dijjer/Dijjer/src/dijjer/io/comm/UdpSocketManager.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** UdpSocketManager.java 25 Aug 2005 00:47:34 -0000 1.40 --- UdpSocketManager.java 25 Aug 2005 23:40:24 -0000 1.41 *************** *** 74,77 **** --- 74,78 ---- || m.getSpec().equals(DMT.packetTransmit) ) { + if (m.getSpec().equals(DMT.packetTransmit)) // no more ping pong Logger.debug("" + (System.currentTimeMillis() % 60000) + " " + _listenPort + " <- " + m.getSource() + " : " + m); *************** *** 114,117 **** --- 115,119 ---- || m.getSpec().equals(DMT.packetTransmit) ) { + if (m.getSpec().equals(DMT.packetTransmit)) // no more ping pong Logger.debug("" + (System.currentTimeMillis() % 60000) + " " + _listenPort + " -> " + destination + " : " + m); |
1 message has been excluded from this view by a project administrator.
