Changeset 81:eb9fad69e486 in mediastreamer2


Ignore:
Timestamp:
Oct 13, 2008 5:20:18 PM (5 years ago)
Author:
jehan <jehan@…>
Branch:
default
Message:

add native test ++

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@84 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:
p2pproxy
Files:
2 added
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • p2pproxy/launcher/.cproject

    r48 r81  
    122122<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/> 
    123123 
     124 
    124125<storageModule moduleId="scannerConfiguration"> 
    125126<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> 
    … …  
    507508<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/> 
    508509 
     510 
    509511<storageModule moduleId="scannerConfiguration"> 
    510512<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> 

  • p2pproxy/launcher/Debug/makefile

    r77 r81  
    3030        @echo 'Building target: $@' 
    3131        @echo 'Invoking: GCC C Linker' 
    32         gcc -L/usr/lib/jvm/java-6-openjdk/jre/lib/amd64 -L/usr/lib/jvm/java-6-openjdk/jre/lib/i386 -L/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server -L/usr/lib/jvm/java-6-openjdk/jre/lib/i386/server -o"p2pproxy-launcher" $(OBJS) $(USER_OBJS) $(LIBS) 
     32        gcc -L/usr/lib/jvm/java-6-openjdk/jre/lib/amd64 -L/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server -o"p2pproxy-launcher" $(OBJS) $(USER_OBJS) $(LIBS) 
    3333        @echo 'Finished building target: $@' 
    3434        @echo ' ' 

  • p2pproxy/launcher/src/launcher-tester.c

    r77 r81  
    3333         
    3434        char string_buffer[256]; 
    35         if (p2pproxy_resourcelocation_get_sip_proxyregistrar_uri(string_buffer,256) != P2PPROXY_NO_ERROR) { 
     35        if (p2pproxy_resourcemgt_lookup_sip_proxy(string_buffer,256,"p2p.linphone.org") != P2PPROXY_NO_ERROR) { 
    3636                printf("cannot get proxy\n");    
    3737        } else { 
    3838                printf("registrar is [%s]\n",string_buffer); 
    3939        } 
     40         
     41        if (p2pproxy_resourcemgt_revoke_sip_proxy(string_buffer) != P2PPROXY_NO_ERROR) { 
     42                printf("cannot fulsh  proxy [%s]\n",string_buffer);      
     43        } 
     44 
     45        if (p2pproxy_resourcemgt_lookup_sip_proxy(string_buffer,256,"toto.linphone.org") != P2PPROXY_RESOURCEMGT_SERVER_NOT_FOUND) { 
     46                printf("unexpected proxy [%s]\n",string_buffer);         
     47        } else { 
     48                printf("unknown domaine\n"); 
     49        } 
     50 
    4051        if (p2pproxy_accountmgt_deleteAccount("sip:titi@p2p.linphone.org") != P2PPROXY_NO_ERROR) { 
    4152                printf("cannot delete account \n");      
    4253        } 
     54         
    4355         
    4456        p2pproxy_application_stop(); 

  • p2pproxy/launcher/src/p2pproxy.c

    r77 r81  
    11#include <stdio.h> 
    22#include <jni.h> 
     3#include <string.h> 
    34#include "p2pproxy.h" 
    45 
    … …  
    139140} 
    140141 
    141 int p2pproxy_resourcelocation_get_sip_proxyregistrar_uri(char* aStringArray, size_t aSize) { 
    142         jmethodID getSipProxyRegistrarUriMethod; 
     142int p2pproxy_resourcemgt_lookup_sip_proxy(char* proxy_uri,size_t size, char* domaine) { 
     143        jmethodID lLookupSipProxyUriMethod; 
    143144        jstring lJStringResult;  
    144145        const jbyte* lString; 
    145146        jboolean  lIsCopy; 
    146         GET_JNI_ENV 
    147          
    148         getSipProxyRegistrarUriMethod = (*lJniEnv)->GetStaticMethodID(lJniEnv, lMainClass, "getSipProxyRegistrarUri", "()Ljava/lang/String;"); 
    149         lJStringResult = (*lJniEnv)->CallStaticObjectMethod(lJniEnv, lMainClass, getSipProxyRegistrarUriMethod); 
     147        jstring applicationArg; 
     148         
     149        GET_JNI_ENV 
     150          
     151         
     152        applicationArg = (*lJniEnv)->NewStringUTF(lJniEnv, domaine); 
     153        lLookupSipProxyUriMethod = (*lJniEnv)->GetStaticMethodID(lJniEnv, lMainClass, "lookupSipProxyUri", "(Ljava/lang/String;)Ljava/lang/String;"); 
     154        lJStringResult = (*lJniEnv)->CallStaticObjectMethod(lJniEnv, lMainClass, lLookupSipProxyUriMethod, applicationArg); 
    150155        if (lJStringResult == 0) { 
    151                 return P2PPROXY_ERROR_RESOURCELOCATOR_SERVER_NOT_FOUND; 
     156                return P2PPROXY_RESOURCEMGT_SERVER_NOT_FOUND; 
    152157        } 
    153158        lString =  (*lJniEnv)->GetStringUTFChars(lJniEnv, lJStringResult, &lIsCopy); 
    154         memcpy(aStringArray,lString,aSize); 
     159        memcpy(proxy_uri,lString,size); 
    155160        (*lJniEnv)->ReleaseStringUTFChars(lJniEnv, lJStringResult, lString); 
    156161        (*p2pproxy_application_jvm)->DetachCurrentThread(p2pproxy_application_jvm); 
    … …  
    158163} 
    159164 
     165int p2pproxy_resourcemgt_revoke_sip_proxy(char* proxy_uri) { 
     166        jmethodID revokeProxyMethod; 
     167        jstring lJStringResult;  
     168        const jbyte* lString; 
     169        jboolean  lIsCopy; 
     170        GET_JNI_ENV 
     171         
     172        revokeProxyMethod = (*lJniEnv)->GetStaticMethodID(lJniEnv, lMainClass, "revokeSipProxy", "(Ljava/lang/String;)V"); 
     173        (*lJniEnv)->CallStaticVoidMethod(lJniEnv, lMainClass, revokeProxyMethod); 
     174        if (lJStringResult == 0) { 
     175                return P2PPROXY_ERROR; 
     176        } 
     177        return P2PPROXY_NO_ERROR; 
     178} 
    160179int p2pproxy_application_get_state() { 
    161180        jmethodID stateMethod; 

  • p2pproxy/launcher/src/p2pproxy.h

    r74 r81  
    3030#define P2PPROXY_ACCOUNTMGT_USER_EXIST 1 
    3131#define P2PPROXY_ACCOUNTMGT_USER_NOT_EXIST 0  
    32  
     32#define P2PPROXY_RESOURCEMGT_SERVER_NOT_FOUND  3 
    3333/* state code*/ 
    3434#define P2PPROXY_CONNECTED 2 
    … …  
    4242#define P2PPROXY_ERROR_ACCOUNTMGT_USER_ALREADY_EXIST  -4 
    4343#define P2PPROXY_ERROR_ACCOUNTMGT_BAD_SIP_URI  -5 
    44 #define P2PPROXY_ERROR_RESOURCELOCATOR_SERVER_NOT_FOUND  -6 
     44#define P2PPROXY_ERROR_RESOURCEMGT_SERVER_NOT_FOUND  -6 
    4545 
    4646#ifndef SWIG 
    … …  
    9898int p2pproxy_accountmgt_deleteAccount(const char* user_name); 
    9999 
    100 /***************************/ 
    101 /***resource location******/ 
    102 /***************************/ 
     100/****************************/ 
     101/***resource management******/ 
     102/****************************/ 
    103103/** 
    104 * access a proxy registrar sip addreess  
    105 * @param buffer allocated by the user 
    106 * @param size buffer size 
     104* access a proxy registrar sip addreess for a given domaine name  
     105* @param [out] proxy_uri buffer allocated by the user 
     106* @param [in] size buffer size 
     107* @param [in] domaine name 
    107108* @return status code P2PPROXY_NO_ERROR, P2PPROXY_ERROR_RESOURCELOCATOR_SERVER_NOT_FOUND 
    108109*/ 
    109 int p2pproxy_resourcelocation_get_sip_proxyregistrar_uri(char* string_buffer,size_t size) ; 
     110int p2pproxy_resourcemgt_lookup_sip_proxy(char* proxy_uri,size_t size, char* domaine) ; 
     111/* 
     112 * notify the library at a given proxy is no longuer reachable  
     113* @param [in] proxy sip uri 
     114* @return status code P2PPROXY_NO_ERROR 
     115*/ 
     116int p2pproxy_resourcemgt_revoke_sip_proxy(char* proxy_uri); 
     117 
    110118 
    111119#endif /*SWIG*/ 

  • p2pproxy/src/org/linphone/p2pproxy/api/P2pProxySipProxyRegistrarManagement.java

    r70 r81  
    2020package org.linphone.p2pproxy.api; 
    2121 
    22 import java.net.InetSocketAddress; 
     22 
    2323 
    2424public interface P2pProxySipProxyRegistrarManagement { 
    2525   /** 
    2626    *  
    27     * @return the SIP uri of an available sip proxy registrar  
     27    * @return the SIP uri of an available sip proxy registrar for a given domaine  
    2828    */ 
    29    public String getSipProxyRegistrarUri() throws P2pProxyException ; 
     29   public String lookupSipProxyUri(String aDomaine) throws P2pProxyException ; 
     30    
     31   public void revokeSipProxy(String aProxy) throws P2pProxyException; 
     32    
    3033} 

  • p2pproxy/src/org/linphone/p2pproxy/core/JxtaNetworkManager.java

    r70 r81  
    137137         lNetworkConfigurator.load(); 
    138138      } 
    139        
     139      //mode is alway taken from start line 
     140      lNetworkConfigurator.setMode(lMode); 
    140141      // set sedding host 
    141142      if (aProperties.getProperty(SEEDING_RDV) != null) { 

  • p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMain.java

    r79 r81  
    387387      if ((mJxtaNetworkManager!=null && mJxtaNetworkManager.isConnectedToRendezVous(0) == true)  
    388388          ||  
    389           (mJxtaNetworkManager!=null && mJxtaNetworkManager.getPeerGroup().getRendezVousService().isRendezVous())) 
    390       { 
     389          (mJxtaNetworkManager!=null && mJxtaNetworkManager.getPeerGroup().getRendezVousService().isRendezVous())) { 
    391390         //nop connected 
    392391      } else { 
    393           throw new P2pProxyNotReadyException("not connected to any rdv"); 
     392          throw new P2pProxyNotReadyException("not connected to any rdv: status ["+mJxtaNetworkManager.getPeerGroup().getRendezVousService().getRendezVousStatus()+"]"); 
    394393      } 
    395394   } catch (InterruptedException e) { 
    … …  
    432431   } 
    433432} 
    434 public static String getSipProxyRegistrarUri() { 
    435    try { 
    436       isReady(); 
    437       return mP2pProxySipProxyRegistrarManagement.getSipProxyRegistrarUri(); 
     433public static String lookupSipProxyUri(String aDomaine) { 
     434   try { 
     435      isReady(); 
     436      return mP2pProxySipProxyRegistrarManagement.lookupSipProxyUri(aDomaine); 
    438437   } catch (Exception e) { 
    439438      return null; 
    … …  
    445444      return P2pProxylauncherConstants.P2PPROXY_CONNECTED; 
    446445   } catch (P2pProxyException e) { 
     446      mLog.error("cannot get state",e); 
    447447      return P2pProxylauncherConstants.P2PPROXY_NOT_CONNECTED; 
    448448   }    
    449449} 
     450public static int revokeSipProxy(String aProxy) { 
     451   try { 
     452      isReady(); 
     453      mLog.error("not implemented"); 
     454      return P2pProxylauncherConstants.P2PPROXY_ERROR; 
     455   } catch (P2pProxyException e) { 
     456      return P2pProxylauncherConstants.P2PPROXY_NOT_CONNECTED; 
     457   }    
     458} 
     459 
    450460public static void stop() { 
    451461   mExit = true; 

  • p2pproxy/src/org/linphone/p2pproxy/core/P2pProxySipProxyRegistrarManagementImpl.java

    r79 r81  
    11package org.linphone.p2pproxy.core; 
    22 
     3import org.apache.log4j.Logger; 
    34import org.linphone.p2pproxy.api.P2pProxyException; 
    45import org.linphone.p2pproxy.api.P2pProxySipProxyRegistrarManagement; 
    … …  
    67 
    78public class P2pProxySipProxyRegistrarManagementImpl implements P2pProxySipProxyRegistrarManagement { 
    8         protected final JxtaNetworkManager mJxtaNetworkManager; 
    9         P2pProxySipProxyRegistrarManagementImpl(JxtaNetworkManager aJxtaNetworkManager) { 
    10                 mJxtaNetworkManager = aJxtaNetworkManager; 
    11         } 
    12         public String getSipProxyRegistrarUri() throws P2pProxyException { 
    13                 try { 
    14                         SipProxyRegistrarAdvertisement lSipProxyRegistrarAdvertisement = (SipProxyRegistrarAdvertisement) (mJxtaNetworkManager.getAdvertisement(null, SipProxyRegistrarAdvertisement.NAME, true)); 
    15                         return lSipProxyRegistrarAdvertisement.getAddress(); 
    16                 }catch (Exception e) { 
    17                         throw new P2pProxyException(e); 
    18                 } 
     9   protected final JxtaNetworkManager mJxtaNetworkManager; 
     10   private final String DOMAINE="p2p.linphone.org"; 
     11   private final static Logger mLog = Logger.getLogger(P2pProxySipProxyRegistrarManagementImpl.class); 
     12   P2pProxySipProxyRegistrarManagementImpl(JxtaNetworkManager aJxtaNetworkManager) { 
     13      mJxtaNetworkManager = aJxtaNetworkManager; 
     14   } 
     15   public String lookupSipProxyUri(String aDomaine) throws P2pProxyException { 
     16      try { 
     17         if (!DOMAINE.equals(aDomaine)) { 
     18            //unknown domaine 
     19            return null; 
     20         } 
     21         SipProxyRegistrarAdvertisement lSipProxyRegistrarAdvertisement = (SipProxyRegistrarAdvertisement) (mJxtaNetworkManager.getAdvertisement(null, SipProxyRegistrarAdvertisement.NAME, true)); 
     22         return lSipProxyRegistrarAdvertisement.getAddress(); 
     23      }catch (Exception e) { 
     24         throw new P2pProxyException(e); 
     25      } 
    1926 
    20         } 
     27   } 
     28   public void revokeSipProxy(String aProxy) throws P2pProxyException { 
     29      try { 
     30         SipProxyRegistrarAdvertisement lSipProxyRegistrarAdvertisement = (SipProxyRegistrarAdvertisement) (mJxtaNetworkManager.getAdvertisement(null, SipProxyRegistrarAdvertisement.ADDRESS_TAG, true)); 
     31         mJxtaNetworkManager.getPeerGroup().getDiscoveryService().flushAdvertisement(lSipProxyRegistrarAdvertisement); 
     32         mLog.info(aProxy +"revoked"); 
     33      } catch (Exception e) { 
     34         throw new P2pProxyException(e); 
     35      }   
     36   } 
    2137 
    2238} 
Note: See TracChangeset for help on using the changeset viewer.