diff options
| author | Markus Alexander Kuppe | 2010-06-25 14:17:37 +0000 |
|---|---|---|
| committer | Markus Alexander Kuppe | 2010-06-25 14:17:37 +0000 |
| commit | 355854f8498a89c2e5d1045f0cf2c0bab28ba317 (patch) | |
| tree | cc1f2ab20d83e4d2e753c49fb29b544a0fedd4ca | |
| parent | 71d167642f900dc61e448489e7c359b8a089293e (diff) | |
| download | org.eclipse.ecf-355854f8498a89c2e5d1045f0cf2c0bab28ba317.tar.gz org.eclipse.ecf-355854f8498a89c2e5d1045f0cf2c0bab28ba317.tar.xz org.eclipse.ecf-355854f8498a89c2e5d1045f0cf2c0bab28ba317.zip | |
NEW - bug 317994: [Discovery][DNS-SD] TSIG key requires a corresponding key name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=317994
3 files changed, 6 insertions, 7 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java index 561fa1c3f..e66bb5ad5 100644 --- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java +++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java @@ -132,7 +132,8 @@ public class Activator implements BundleActivator, ManagedServiceFactory { final String tsigKey = (String) properties.get(IDnsSdDiscoveryConstants.CA_TSIG_KEY); if(tsigKey != null) { - locator.setTsigKey(tsigKey); + final String tsigKeyName = (String) properties.get(IDnsSdDiscoveryConstants.CA_TSIG_KEY_NAME); + locator.setTsigKey(tsigKeyName, tsigKey); } locator.connect(targetID, null); diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java index fbee5f4bd..939bc9653 100644 --- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java +++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java @@ -355,10 +355,7 @@ public class DnsSdDiscoveryLocator extends AbstractDiscoveryContainerAdapter { } } - /** - * @param tsigKey Sets the TSIG key to be used to sign requests - */ - public void setTsigKey(String aTsigKey) { - resolver.setTSIGKey(new TSIG("default", aTsigKey)); + public void setTsigKey(String tsigKeyName, String tsigKey) { + resolver.setTSIGKey(new TSIG(tsigKeyName, tsigKey)); } } diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/IDnsSdDiscoveryConstants.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/IDnsSdDiscoveryConstants.java index bb62438ca..61791db4c 100644 --- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/IDnsSdDiscoveryConstants.java +++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/IDnsSdDiscoveryConstants.java @@ -24,6 +24,7 @@ public interface IDnsSdDiscoveryConstants { /** * Config admin key to define the TSIG key to be used to sign requests */ - public final String CA_TSIG_KEY = "tsig_key"; + public final String CA_TSIG_KEY = "tsig-key"; + public final Object CA_TSIG_KEY_NAME = "tsig-key-name"; } |