Menu
▾
▴
[Smartfrog-checkins] core/components/slp/src/org/smartfrog/services/comm/slp/agents DirectoryAgent.java,1.1,1.2 SARegistrationThread.java,1.1,1.2 SLPAgent.java,1.1,1.2 SLPDatabase.java,1.1,1.2 SLPMessageSender.java,1.1,1.2 ServiceAgent.java,1.1,1.2 UserAgent.java,1.3,1.4
|
From: Glenn H. <tur...@us...> - 2004-06-19 15:02:14
|
Update of /cvsroot/smartfrog/core/components/slp/src/org/smartfrog/services/comm/slp/agents In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3441/src/org/smartfrog/services/comm/slp/agents Modified Files: DirectoryAgent.java SARegistrationThread.java SLPAgent.java SLPDatabase.java SLPMessageSender.java ServiceAgent.java UserAgent.java Log Message: - Prim/Reference/Object locators can now return a Vector containing all discovered services. - some clean-up and fixes... Index: UserAgent.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/slp/src/org/smartfrog/services/comm/slp/agents/UserAgent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UserAgent.java 16 Jun 2004 18:01:34 -0000 1.3 --- UserAgent.java 19 Jun 2004 15:02:03 -0000 1.4 *************** *** 148,152 **** // find service types ! public synchronized ServiceLocationEnumeration findServiceTypes( String NA, Vector scopes) --- 148,152 ---- // find service types ! public ServiceLocationEnumeration findServiceTypes( String NA, Vector scopes) *************** *** 171,178 **** /** ! Not implemented. ! Will throw an exception and exit */ ! public synchronized ServiceLocationEnumeration findAttributes( ServiceType type, Vector scopes, --- 171,177 ---- /** ! */ ! public ServiceLocationEnumeration findAttributes( ServiceType type, Vector scopes, *************** *** 184,191 **** /** ! Not implemented. ! Will throw an exception and exit */ ! public synchronized ServiceLocationEnumeration findAttributes( ServiceURL url, Vector scopes, --- 183,189 ---- /** ! */ ! public ServiceLocationEnumeration findAttributes( ServiceURL url, Vector scopes, *************** *** 209,213 **** SLPInputStream sis, ServiceLocationEnumeration results) throws ServiceLocationException { - //System.out.println("UserAgent -> Received reply"); msg.fromInputStream(sis); --- 207,210 ---- *************** *** 295,299 **** protected DAInfo recvDAAdvert(SLPInputStream sis) throws ServiceLocationException { - System.out.println("UA: Received DAAdvert"); DAInfo newDA = super.recvDAAdvert(sis); if(newDA != null && userSelectableScopes) { --- 292,295 ---- *************** *** 313,317 **** msg.fromInputStream(sis); - System.out.println("UA -> Received SAAdvert"); writeLog(msg.toString()); --- 309,312 ---- *************** *** 354,361 **** Handles incoming multicast messages. This is called by the receive callback when a message is received on the ! fabricClient litening to the multicast address. */ public SLPMessageHeader handleNonReplyMessage(int function, SLPInputStream sis, boolean isUDP) throws ServiceLocationException { - //System.out.println("UserAgent -> Incoming multicast message"); switch(function) { case SLPMessageHeader.SLPMSG_DAADV: --- 349,355 ---- Handles incoming multicast messages. This is called by the receive callback when a message is received on the ! SlpUdpClient litening to the multicast address. */ public SLPMessageHeader handleNonReplyMessage(int function, SLPInputStream sis, boolean isUDP) throws ServiceLocationException { switch(function) { case SLPMessageHeader.SLPMSG_DAADV: *************** *** 374,382 **** public boolean handleReplyMessage(int function, SLPInputStream sis, ServiceLocationEnumeration results) throws ServiceLocationException { - //System.out.println("UserAgent -> Incoming unicast message"); switch(function) { case SLPMessageHeader.SLPMSG_SRVRPLY: return recvSrvReply(new SLPSrvRplyMessage(), sis, results); - //break; case SLPMessageHeader.SLPMSG_SRVTYPE: return recvSrvTypeReply(new SLPSrvTypeRplyMessage(), sis, results); --- 368,374 ---- *************** *** 431,445 **** return SLPUtil.findCommonScopes(supportedScopes, scopes); - /* - Vector toReturn = new Vector(); - Iterator iter = scopes.iterator(); - while(iter.hasNext()) { - Object o = iter.next(); - if(supportedScopes.contains(o)) { - toReturn.add(o); - } - } - return toReturn; - */ } --- 423,426 ---- *************** *** 463,467 **** if(da.getHost().equals(CONFIG_SLP_MC_ADDR)) { - //System.out.println("UserAgent -> Sending multicast"); request.setFlags(SLPMessageHeader.FLAG_MCAST); ms.sendSLPMessage(request, --- 444,447 ---- *************** *** 470,477 **** } else { - //System.out.println("UserAgent -> Sending to DA"); // If the DA is down, we should try to find another DA supporting // the wanted scopes, or in the worst case use multicast... - // Currently the we go directly do multicast if a DA is down try { ms.sendSLPMessage(request, --- 450,455 ---- *************** *** 481,493 **** if(se.getErrorCode() == ServiceLocationException.DA_NOT_AVAILABLE) { DAs.remove(da.getHost()); ! // do multicast... ! // Should try to find another DA before going multicast... ! /* ! DAInfo mc = new DAInfo(CONFIG_SLP_MC_ADDR, CONFIG_SLP_PORT); ! if(!receivers.contains(mc)) { ! additional = mc; ! } ! */ ! // find another DA (or DAs)... additional = findReceivers(da.getScopes()); --- 459,463 ---- if(se.getErrorCode() == ServiceLocationException.DA_NOT_AVAILABLE) { DAs.remove(da.getHost()); ! // find another DA (or DAs)... additional = findReceivers(da.getScopes()); *************** *** 512,519 **** } ! public synchronized ServiceLocationEnumeration findAttributes( ! String url, ! Vector scopes, ! Vector attrIds) throws ServiceLocationException { ServiceLocationEnumeration results = new ServiceAttributeEnumeration(); --- 482,489 ---- } ! public ServiceLocationEnumeration findAttributes( ! String url, ! Vector scopes, ! Vector attrIds) throws ServiceLocationException { ServiceLocationEnumeration results = new ServiceAttributeEnumeration(); Index: SARegistrationThread.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/slp/src/org/smartfrog/services/comm/slp/agents/SARegistrationThread.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SARegistrationThread.java 15 Jun 2004 13:01:32 -0000 1.1 --- SARegistrationThread.java 19 Jun 2004 15:02:03 -0000 1.2 *************** *** 143,147 **** toRemove = new LinkedList(); timer = new Timer(true); - //System.out.println("SAReg: Starting timer..."); long interval = REFRESH_INTERVAL*1000; timer.schedule(new SARefreshTimerTask(this), interval, interval); --- 143,146 ---- *************** *** 263,267 **** ServiceURL url = new ServiceURL(e.getURL().toString(), newLifetime); if(!owner.registerService(url, e.getAttributes(), da)) { ! break; // Failed to contact DA. No need to continue. } } --- 262,266 ---- ServiceURL url = new ServiceURL(e.getURL().toString(), newLifetime); if(!owner.registerService(url, e.getAttributes(), da)) { ! iter.remove(); // Failed to contact DA. } } *************** *** 325,329 **** // send registration... if(!owner.deregisterService(u, da)) { ! break; // DA is down } } --- 324,328 ---- // send registration... if(!owner.deregisterService(u, da)) { ! iter.remove(); // DA is down } } Index: SLPMessageSender.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/slp/src/org/smartfrog/services/comm/slp/agents/SLPMessageSender.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SLPMessageSender.java 15 Jun 2004 13:01:32 -0000 1.1 --- SLPMessageSender.java 19 Jun 2004 15:02:03 -0000 1.2 *************** *** 210,214 **** stupidException = ServiceLocationException.INTERNAL_SYSTEM_ERROR; if(owner.CONFIG_LOG_ERRORS) owner.writeLog("Internal System Error: " +e.toString()); - //return 0; return true; } --- 210,213 ---- *************** *** 272,276 **** */ private synchronized void timerResendCallback() { - //System.out.println("SLPMessageSender -> resending message"); try { communicator.send(thePacket); --- 271,274 ---- *************** *** 284,290 **** */ private synchronized void timerTimeoutCallback() { - //System.out.println("SLPMessageSender -> timeoutCallback..."); if( (theRequest.getFlags() & SLPMessageHeader.FLAG_MCAST) == 0) { - System.out.println("TimeoutCallback -> DA seems to be down..."); // set an error to indicate that the DA is down... --- 282,286 ---- Index: DirectoryAgent.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/slp/src/org/smartfrog/services/comm/slp/agents/DirectoryAgent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectoryAgent.java 15 Jun 2004 13:01:32 -0000 1.1 --- DirectoryAgent.java 19 Jun 2004 15:02:03 -0000 1.2 *************** *** 424,428 **** */ private SLPMessageHeader handleServiceRegistration(SLPInputStream sis, boolean isUDP) { - System.out.println("DA -> SrvReg"); SLPSrvRegMessage msg = new SLPSrvRegMessage(); SLPMessageHeader reply = null; --- 424,427 ---- Index: SLPAgent.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/slp/src/org/smartfrog/services/comm/slp/agents/SLPAgent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SLPAgent.java 15 Jun 2004 13:01:32 -0000 1.1 --- SLPAgent.java 19 Jun 2004 15:02:03 -0000 1.2 *************** *** 249,254 **** Random rnd = new Random(); int start_wait = Math.abs(rnd.nextInt()%CONFIG_START_WAIT); - //daLocator = new DALocator(this, CONFIG_DA_FIND, start_wait); - //daLocator.start(); daLocator = new Timer(); daLocator.schedule(new TimerTask() { --- 249,252 ---- *************** *** 337,341 **** try { ms.sendSLPMessage(daRequest, - //address, CONFIG_SLP_AGENTPORT, CONFIG_SLP_MC_ADDR, CONFIG_SLP_PORT, CONFIG_MC_MAX, unicastCommunicator); --- 335,338 ---- *************** *** 354,358 **** */ protected DAInfo recvDAAdvert(SLPInputStream sis) throws ServiceLocationException { - //System.out.println("SLPAgent -> Received DAAdvert"); DAInfo added = null; SLPDAAdvMessage msg = new SLPDAAdvMessage(); --- 351,354 ---- *************** *** 441,447 **** return (Vector)supportedScopes.clone(); } - - protected void finalize() { - System.out.println("SLPAgent -> Finalize..."); - } } --- 437,439 ---- Index: SLPDatabase.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/slp/src/org/smartfrog/services/comm/slp/agents/SLPDatabase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SLPDatabase.java 15 Jun 2004 13:01:32 -0000 1.1 --- SLPDatabase.java 19 Jun 2004 15:02:03 -0000 1.2 *************** *** 298,304 **** } ! /** ! NOT FULLY IMPLEMENTED ! */ public synchronized Vector findServiceAttributes(ServiceType type, Locale loc, Vector tags) { Vector toReturn = new Vector(); --- 298,302 ---- } ! public synchronized Vector findServiceAttributes(ServiceType type, Locale loc, Vector tags) { Vector toReturn = new Vector(); *************** *** 318,324 **** } - /** - NOT FULLY IMPLEMENTED - */ public synchronized Vector findServiceAttributes(ServiceURL url, Locale loc, Vector tags) { Vector toReturn = new Vector(); --- 316,319 ---- *************** *** 370,377 **** // check if the set of attributes matches the predicate if(predicate.equals("")) { - //System.out.println("SLPDatabase -> No predicate given"); return true; // no predicate given. } - //System.out.println("SLPDatabase -> Predicate = " + predicate); /* --- 365,370 ---- *************** *** 406,410 **** private void appendAttributes(Vector attributes, Vector tags, Vector result) { - // TODO ! // loop through attributes... for(Iterator it=attributes.iterator(); it.hasNext(); ) { --- 399,402 ---- Index: ServiceAgent.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/slp/src/org/smartfrog/services/comm/slp/agents/ServiceAgent.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ServiceAgent.java 15 Jun 2004 13:01:32 -0000 1.1 --- ServiceAgent.java 19 Jun 2004 15:02:03 -0000 1.2 *************** *** 121,125 **** tcpListener = new SLPTcpServer(address, unicastCommunicator.getPort(), this); tcpListener.start(); - //System.out.println("TcpListener started on port " + unicastCommunicator.getTransport().socket().getLocalPort()); }catch(Exception e) { e.printStackTrace(); --- 121,124 ---- *************** *** 196,206 **** case SLPMessageHeader.SLPMSG_SRVREQ: return recvSrvReqMessage(sis, isUDP); - //break; case SLPMessageHeader.SLPMSG_SRVTYPE: return recvSrvTypeReqMessage(sis, isUDP); - //break; case SLPMessageHeader.SLPMSG_ATTRREQ: return recvAttrReqMessage(sis, isUDP); - //break; case SLPMessageHeader.SLPMSG_DAADV: if(CONFIG_PASSIVE_DA) { --- 195,202 ---- *************** *** 230,234 **** // if we have replied to this message before: do nothing. if(msg.getPRList().indexOf(address.getHostAddress()) != -1) { - //System.out.println("ServiceAgent -> Have replied to this before..."); return null; //have replied before... } --- 226,229 ---- *************** *** 280,284 **** // if we have replied to this message before: do nothing. if(msg.getPRList().indexOf(address.getHostAddress()) != -1) { - //System.out.println("ServiceAgent -> Have replied to this before..."); return null; //have replied before... } --- 275,278 ---- *************** *** 315,319 **** // if we have replied to this message before: do nothing. if(msg.getPRList().indexOf(address.getHostAddress()) != -1) { - //System.out.println("ServiceAgent -> Have replied to this before..."); return null; //have replied before... } --- 309,312 ---- *************** *** 469,473 **** */ protected Vector getDAList() { - //return (Vector)DAs.clone(); return new Vector(DAs.values()); } --- 462,465 ---- |