Changeset 50

Timestamp:

10/26/10 14:25:07 (13 years ago)

Author:

bowman

Message:

Preparations for 0.9.1 RC, misc fixes and cleanup.

Location:

trunk

Files:

• README.Optimization.txt (modified) (2 diffs)
• README.XmlUserManager.txt (modified) (1 diff)
• README.txt (modified) (3 diffs)
• changelog.txt (modified) (1 diff)
• src/com/bowman/cardserv/CardServProxy.java (modified) (1 diff)
• src/com/bowman/cardserv/SidCacheLinker.java (modified) (5 diffs)

trunk/README.Optimization.txt

@@ -75 +75 @@
 3. Proxy configuration
 ----------------------
+
+Always start from scratch with the auto-generated config. Do not add any options until you understand what they do and
+you see an actual need from analyzing the logs.
 
 To get a definitive overview of what the proxy does with each config value (and where it does it), you can start java
@@ -173 +176 @@
 10-15 seconds (but avoid lower values) to minimize downtime due to shaky connections when there are few cards available.
 Keep in mind that whenever a connection is lost one immediate retry is performed, so its usually best to leave this
-at 30-60 seconds.
+at 30-60 seconds. Setting too low may cause connectors to never reconnect.
 
 <connection-manager> / <default-keepalive-interval>

trunk/README.XmlUserManager.txt

@@ -26 +26 @@
 - The url of the xml file with user definitions. The file should match the auth-config for SimpleUserManager, but
 the top level element is ignored. See config/users.example.xml for an example. 
-Any url can be used, including https/ftp with user:passwd@hostname type auth info. File urls are also accepted.
+Any url can be used, including https/ftp with user:passwd@hostname type auth info.
+File urls are also accepted. NOTE: Relative file urls are written with no initial slashes, e.g: file:etc/users.xml
 
 NOTE: When using a http/https url, it doesn't have to point to an actual static xml file. A php/jsp/asp page that

trunk/README.txt

@@ -1 @@
-Cardservproxy 0.9.1
--------------------
+Cardservproxy 0.9.1 (See README.0.9.0.txt for features/changes specific to 0.9.x versions)
+------------------------------------------------------------------------------------------
 
 First, in order to avoid the usual confusion about the proxy:
@@ -93 +93 @@
 
 - Define ca-profiles, one for each provider/vendor/card-type (yes if two providers happen to use the same ca-system, two
-  separate profiles are still required). Ca-profiles can be thought of as virtual cardservers, and will seem to the
+  separate profiles may still be required). Ca-profiles can be thought of as virtual cardservers, and will seem to the
   clients like single cards (with a potentially infinite capacity). If you have an enigma1 services file (dreambox)
   you can fetch that and place it where the proxy can read it and point it out in the profile definition. This will
@@ -102 +102 @@
   only one port is required per profile (or two if you need both newcamd and radegast listeners), but it is now
   possible to have an arbitrary number of listen ports for the same profile, complete with their own accept/deny lists
-  and other protocol-specific settings.
+  and other protocol-specific settings. If it is a satellite setup for mgcamd clients alone, you can create profiles
+  without ports and use the combined extended-newcamd listen port (top of the generated config) to access all profiles.
 
 - Define cws-connectors for each cardserver that the proxy should connect to. Use one newcamd-connector or

trunk/changelog.txt

@@ -2 +2 @@
 ------------------------
 
-0.9.1 - RC0
+0.9.1 - RC0 (see README.0.9.0.txt for conceptual changes and tips)
 
 - Fixed: Handling for unknown sid (0 or a dummy sid listed in dummy-services) was broken in 0.9.0.
 - Fixed: Incoming requests for dummy sids should not retain the dummy when forwarded, now changed to 0.
 - Fixed: Per profile max-cw-wait could not be set below 1s (now both per profile and global allow down to 100 ms).
+  NOTE: While it may now be possible to configure such low values, whether it works or not below 1s is still undefined.
 - Fixed: Probing was sometimes attempted even when there was only one candidate connector.
 - Fixed: Radegast support updated to make sense with 0.9.x.
 - Fixed: Emm handling for extended newcamd in systems with signifcant provider-idents.
+- Fixed: Now possible to move messages between profiles from plugins, changes to networkid/caid were previously ignored.
 - Changed: Two ecms (or dcw replies) with the same payload data but different dvb table ids (even/0x80 vs odd/0x81) are
   now considered identical by the proxy. Implications unknown.

trunk/src/com/bowman/cardserv/CardServProxy.java

@@ -363 +363 @@
           return;
         }
+      } else { // allow plugins to move messages to other profiles regardless of origin
+        profile = config.getProfileById(msg.getNetworkId(), msg.getCaId());
+        if(profile == null) profile = session.getProfile();
       }
       msg.setProfileName(profile.getName()); // just a lookup shortcut for all remaining processing

trunk/src/com/bowman/cardserv/SidCacheLinker.java

@@ -183 +183 @@
       sCmd = new StatusCommand("required-services", "List required services", "List services that need to be permanently in cache for the sid linker to work", false);
       sCmd.register(this);
+
+      sCmd = new StatusCommand("linked-services", "List linked services", "List all services that have been configured for sid-cache-linking", false);
+      sCmd.register(this);
     } catch (NoSuchMethodException e) {
       e.printStackTrace();
@@ -257 +260 @@
         xb.appendElement("link").appendAttr("id", i + 1).endElement(false);
         xb.appendElement("required");
-        XmlHelper.xmlFormatServices(new TvService[] {services[i]}, xb, false, true, false, null, profiles);
+        XmlHelper.xmlFormatServices(new TvService[] {services[i]}, xb, false, true, true, null, profiles);
         xb.closeElement("required");
         xb.appendElement("opens");
-        XmlHelper.xmlFormatServices((TvService[])opens.toArray(new TvService[opens.size()]), xb, false, true, false, null, profiles);
+        XmlHelper.xmlFormatServices((TvService[])opens.toArray(new TvService[opens.size()]), xb, false, true, true, null, profiles);
         xb.closeElement("opens");
         xb.closeElement("link");
@@ -266 +269 @@
     }
     xb.closeElement("required-services");
+  }
+
+  public void runStatusCmdLinkedServices(XmlStringBuffer xb, Map params, String user) {
+    String[] profiles = (String[])params.get("profiles");
+    Set linkStrs = new TreeSet();
+    Set set; int i = 0;
+    xb.appendElement("linked-services", "count", sidLinksMap.values().size());
+    for(Iterator iter = sidLinksMap.values().iterator(); iter.hasNext(); ) {
+      set = (Set)iter.next();
+      if(!linkStrs.contains(set.toString())) {
+        xb.appendElement("link").appendAttr("id", (i++) + 1).endElement(false);
+        XmlHelper.xmlFormatServices(toTvServiceArray(set), xb, false, true, true, null, profiles);
+        xb.closeElement("link");
+        linkStrs.add(set.toString());
+      }
+    }
+    xb.closeElement("linked-services");
+  }
+
+  private TvService[] toTvServiceArray(Set set) {
+    TvService[] ts = new TvService[set.size()];
+    SidEntry se; int i = 0; ServiceMapping sm;
+    for(Iterator iter = set.iterator(); iter.hasNext(); ) {
+      se = (SidEntry)iter.next();
+      ts[i] = config.getService(se.profileName, se.serviceId);
+      sm = new ServiceMapping(se.serviceId, 0);
+      sm.setProviderIdent(ServiceMapping.NO_PROVIDER);
+      ts[i].setCustomData(sm.getCustomData());
+      i++;
+    }
+    return ts;
   }
 
@@ -424 +458 @@
   private void reportAddedService(CamdNetMessage req, CamdNetMessage origReq) {
     String profileName = req.getProfileName();
-    TvService ts1 = config.getService(profileName, origReq.getServiceId());
+    TvService ts1 = config.getService(profileName, origReq.getServiceId());    
     Set services = (Set)requiredServices.get(ts1);
     if(services == null) services = new TreeSet();
@@ -430 +464 @@
     if(ts1.equals(ts2)) return;
     services.add(ts2);
+    ServiceMapping sm = new ServiceMapping(req);
+    ts2.setCustomData(sm.getCustomData()); // make sure full custom data shows up in the status cmd xml views
+    ts1.setCustomData(new ServiceMapping(origReq).getCustomData());
     requiredServices.put(ts1, services); // required service -> all otherwise undecodable services that it unlocks
 
     services = (Set)addedServices.get(profileName);
     if(services == null) services = new TreeSet();
-    if(services.add(new ServiceMapping(req))) {
+    if(services.add(sm)) {
       logger.info("Linked previously undecodable service: " + ts2 + " (unlocked by: " + ts1 + ")");
       // config.getConnManager().cwsFoundService(null, ts2);  // todo