Changeset 119
- Timestamp:
- 05/06/11 15:39:00 (13 years ago)
- Location:
- trunk/src/com/bowman/cardserv
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/com/bowman/cardserv/CamdNetMessage.java
r46 r119 140 140 } 141 141 142 public static CamdNetMessage parseCacheRpl(DataInputStream dais ) throws IOException {142 public static CamdNetMessage parseCacheRpl(DataInputStream dais, CamdNetMessage request) throws IOException { 143 143 CamdNetMessage msg = new CamdNetMessage(dais.readUnsignedByte()); 144 144 msg.type = TYPE_RECEIVED; 145 145 msg.protocol = "Dummy"; 146 msg.setServiceId(request.getServiceId()); 147 msg.networkId = request.networkId; 148 msg.caId = request.caId; 146 149 147 150 if(dais.available() > 0) { // this is a cw reply 148 msg.setServiceId(dais.readUnsignedShort());149 msg.caId = dais.readInt();150 151 msg.customData = new byte[16]; 151 152 dais.readFully(msg.customData); -
trunk/src/com/bowman/cardserv/ClusteredCache.java
r46 r119 62 62 63 63 debug = "true".equalsIgnoreCase(xml.getStringValue("debug", "false")); 64 if(debug) logger.warning("Cache debug mode enabled (will fail sooner or later under any significant traffic)."); 65 64 66 hideNames = "true".equalsIgnoreCase(xml.getStringValue("hide-names", "false")); 65 67 66 68 syncPeriod = xml.getTimeValue("sync-period", 0, "ms"); 67 68 69 if(syncPeriod > 0) logger.info("Strict cache-synchronization is enabled (sync-period is: " + syncPeriod + " ms)."); 69 70 … … 394 395 // - request with arbiternumber: 1 + 1 + 2 + 2 + 2 + 4 + 8 (type request) negotiation for lock 395 396 // - request without arbiternumber: 1 + 1 + 2 + 2 + 2 + 4 (type request) lock 396 // - request and reply: 1 + 1 + 2 + 2 + 2 + 4 1 + 2 + 4+ 16 + connectorNameLen (type reply)397 // - request and empty reply: 1 + 1 + 2 + 2 + 2 + 4 1(type reply)397 // - request and reply: 1 + 1 + 2 + 2 + 2 + 4 1 + 16 + connectorNameLen (type reply) 398 // - request and empty reply: 1 + 1 + 2 + 2 + 2 + 4 1 (type reply) 398 399 399 400 ByteArrayOutputStream bos = new ByteArrayOutputStream(); … … 434 435 dos.writeByte(msg.getCommandTag()); 435 436 if(!msg.isEmpty()) { 436 dos.writeShort(msg.getServiceId());437 dos.writeInt(msg.getCaId());438 437 dos.write(msg.getCustomData()); 439 438 if(msg.getConnectorName() != null) dos.writeUTF(msg.getConnectorName()); … … 534 533 request = CamdNetMessage.parseCacheReq(dis); 535 534 request.setOriginAddress(packet.getAddress().getHostAddress()); 536 CamdNetMessage reply = CamdNetMessage.parseCacheRpl(dis );535 CamdNetMessage reply = CamdNetMessage.parseCacheRpl(dis, request); 537 536 reply.setOriginAddress(packet.getAddress().getHostAddress()); 538 537 if(reply.getConnectorName() != null) reply.setConnectorName("remote: " + reply.getConnectorName()); -
trunk/src/com/bowman/cardserv/DefaultCache.java
r74 r119 184 184 if(reply.isEmpty()) return; // bad reply = unable to decode 185 185 if(reply.getProfileName() == null) reply.setProfileName(request.getProfileName()); 186 if(reply.getNetworkId() == 0) reply.setNetworkId(request.getNetworkId()); 186 187 CamdNetMessage oldReply = (CamdNetMessage)ecmMap.put(request, reply); 187 188 if(oldReply != null) {
Note:
See TracChangeset
for help on using the changeset viewer.